deps src: Automatic update

Author: marvim

src/treesitter_vimdoc-stamp/download-treesitter_vimdoc.cmake

@@ -22,16 +22,16 @@ function(check_file_hash has_hash hash_is_good)
   set("${has_hash}" TRUE PARENT_SCOPE)
 
   message(VERBOSE "verifying file...
-       file='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.0.2.tar.gz'")
+       file='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.1.0.tar.gz'")
 
-  file("SHA256" "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.0.2.tar.gz" actual_value)
+  file("SHA256" "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.1.0.tar.gz" actual_value)
 
-  if(NOT "${actual_value}" STREQUAL "13f2dd182436e0b75db33cc1d097ab0442e0c3135375998f15331dbe9c6b74ab")
+  if(NOT "${actual_value}" STREQUAL "020e8f117f648c8697fca967995c342e92dbd81dab137a115cc7555207fbc84f")
     set("${hash_is_good}" FALSE PARENT_SCOPE)
     message(VERBOSE "SHA256 hash of
-    /home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.0.2.tar.gz
+    /home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.1.0.tar.gz
   does not match expected value
-    expected: '13f2dd182436e0b75db33cc1d097ab0442e0c3135375998f15331dbe9c6b74ab'
+    expected: '020e8f117f648c8697fca967995c342e92dbd81dab137a115cc7555207fbc84f'
       actual: '${actual_value}'")
   else()
     set("${hash_is_good}" TRUE PARENT_SCOPE)
@@ -71,32 +71,32 @@ function(sleep_before_download attempt)
   execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep "${sleep_seconds}")
 endfunction()
 
-if(EXISTS "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.0.2.tar.gz")
+if(EXISTS "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.1.0.tar.gz")
   check_file_hash(has_hash hash_is_good)
   if(has_hash)
     if(hash_is_good)
       message(VERBOSE "File already exists and hash match (skip download):
-  file='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.0.2.tar.gz'
-  SHA256='13f2dd182436e0b75db33cc1d097ab0442e0c3135375998f15331dbe9c6b74ab'"
+  file='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.1.0.tar.gz'
+  SHA256='020e8f117f648c8697fca967995c342e92dbd81dab137a115cc7555207fbc84f'"
       )
       return()
     else()
       message(VERBOSE "File already exists but hash mismatch. Removing...")
-      file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.0.2.tar.gz")
+      file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.1.0.tar.gz")
     endif()
   else()
     message(VERBOSE "File already exists but no hash specified (use URL_HASH):
-  file='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.0.2.tar.gz'
+  file='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.1.0.tar.gz'
 Old file will be removed and new file downloaded from URL."
     )
-    file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.0.2.tar.gz")
+    file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.1.0.tar.gz")
   endif()
 endif()
 
 set(retry_number 5)
 
 message(VERBOSE "Downloading...
-   dst='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.0.2.tar.gz'
+   dst='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.1.0.tar.gz'
    timeout='none'
    inactivity timeout='none'"
 )
@@ -107,7 +107,7 @@ foreach(i RANGE ${retry_number})
   if(status_code IN_LIST download_retry_codes)
     sleep_before_download(${i})
   endif()
-  foreach(url IN ITEMS [====[https://github.com/neovim/tree-sitter-vimdoc/archive/v4.0.2.tar.gz]====])
+  foreach(url IN ITEMS [====[https://github.com/neovim/tree-sitter-vimdoc/archive/v4.1.0.tar.gz]====])
     if(NOT url IN_LIST skip_url_list)
       message(VERBOSE "Using src='${url}'")
 
@@ -119,7 +119,7 @@ foreach(i RANGE ${retry_number})
 
       file(
         DOWNLOAD
-        "${url}" "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.0.2.tar.gz"
+        "${url}" "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.1.0.tar.gz"
 
         # no TIMEOUT
         # no INACTIVITY_TIMEOUT
@@ -136,7 +136,7 @@ foreach(i RANGE ${retry_number})
         check_file_hash(has_hash hash_is_good)
         if(has_hash AND NOT hash_is_good)
           message(VERBOSE "Hash mismatch, removing...")
-          file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.0.2.tar.gz")
+          file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.1.0.tar.gz")
         else()
           message(VERBOSE "Downloading... done")
           return()

src/treesitter_vimdoc-stamp/extract-treesitter_vimdoc.cmake

@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION ${CMAKE_VERSION}) # this file comes with cmake
 
 # Make file names absolute:
 #
-get_filename_component(filename "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.0.2.tar.gz" ABSOLUTE)
+get_filename_component(filename "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_vimdoc/v4.1.0.tar.gz" ABSOLUTE)
 get_filename_component(directory "/home/runner/work/deps/deps/neovim/deps/build/src/treesitter_vimdoc" ABSOLUTE)
 
 message(VERBOSE "extracting...

src/treesitter_vimdoc-stamp/treesitter_vimdoc-urlinfo.txt

@@ -6,7 +6,7 @@ method=url
 command=/usr/local/bin/cmake;-DCMAKE_MESSAGE_LOG_LEVEL=VERBOSE;-P;/home/runner/work/deps/deps/neovim/deps/build/src/treesitter_vimdoc-stamp/download-treesitter_vimdoc.cmake;COMMAND;/usr/local/bin/cmake;-DCMAKE_MESSAGE_LOG_LEVEL=VERBOSE;-P;/home/runner/work/deps/deps/neovim/deps/build/src/treesitter_vimdoc-stamp/verify-treesitter_vimdoc.cmake;COMMAND;/usr/local/bin/cmake;-DCMAKE_MESSAGE_LOG_LEVEL=VERBOSE;-P;/home/runner/work/deps/deps/neovim/deps/build/src/treesitter_vimdoc-stamp/extract-treesitter_vimdoc.cmake
 source_dir=/home/runner/work/deps/deps/neovim/deps/build/src/treesitter_vimdoc
 work_dir=/home/runner/work/deps/deps/neovim/deps/build/src
-url(s)=https://github.com/neovim/tree-sitter-vimdoc/archive/v4.0.2.tar.gz
-hash=SHA256=13f2dd182436e0b75db33cc1d097ab0442e0c3135375998f15331dbe9c6b74ab
+url(s)=https://github.com/neovim/tree-sitter-vimdoc/archive/v4.1.0.tar.gz
+hash=SHA256=020e8f117f648c8697fca967995c342e92dbd81dab137a115cc7555207fbc84f
       no_extract=
 

src/treesitter_vimdoc/Cargo.toml

@@ -1,23 +1,35 @@
 [package]
 name = "tree-sitter-vimdoc"
 description = "Tree-sitter grammar for Vim help files"
-version = "4.0.2"
+version = "4.1.0"
+authors = ["Justin M. Keyes <justinkz@gmail.com>"]
 license = "Apache-2.0"
-keywords = ["incremental", "parsing", "neovim", "vimdoc"]
-categories = ["parsing", "text-editors"]
+readme = "README.md"
+keywords = ["incremental", "parsing", "tree-sitter", "vimdoc"]
+categories = ["parser-implementations", "parsing", "text-editors"]
 repository = "https://github.com/neovim/tree-sitter-vimdoc"
-authors = ["Thomas Vigouroux <tomvig38@gmail.com>"]
 edition = "2021"
 autoexamples = false
 
 build = "bindings/rust/build.rs"
-include = ["bindings/rust/*", "grammar.js", "queries/*", "src/*"]
+include = [
+  "bindings/rust/*",
+  "grammar.js",
+  "queries/*",
+  "src/*",
+  "tree-sitter.json",
+  "/LICENSE",
+]
 
 [lib]
 path = "bindings/rust/lib.rs"
 
 [dependencies]
-tree-sitter = ">=0.25.0"
+tree-sitter = "0.25.10"
+tree-sitter-language = "0.1"
 
 [build-dependencies]
-cc = "^1.0.89"
+cc = "1.2"
+
+[dev-dependencies]
+tree-sitter = "0.25.10"

src/treesitter_vimdoc/Makefile

@@ -14,24 +14,27 @@ Overview
 
 - `block` is the main top-level node, delimited by blank line(s) or any line
   starting with `<` (codeblock terminator).
-  - contains `line` and `line_li` nodes.
+  - Contains `line` and `line_li` nodes.
 - `line`:
-  - contains atoms (words, tags, taglinks, …)
-  - contains headings (`h1`, `h2`, `h3`, `column_heading`) because `codeblock`
+  - Contains atoms (words, tags, taglinks, …)
+  - Contains headings (`h1`, `h2`, `h3`, `column_heading`) because `codeblock`
     terminated by "implicit stop" (no terminating `<`) consumes blank lines, so
     `block` has no way to end.
 - `line_li` ("listitem")
-  - lines starting with `-`/`•` (_not_ `+`/`*`) are listitems.
-  - consumes lines until blank line, codeblock, or next listitem.
-  - nesting is ignored: indented listitems are parsed as siblings.
+  - Lines starting with `-`/`•`/`[0-9].` (_not_ `+`/`*`) are listitems.
+  - Use the `prefix` node to detect if the listitem is ordered (numbered) or
+    unodered.
+  - Consumes lines until blank line, codeblock, or next listitem.
+  - Nesting is ignored: indented listitems are parsed as siblings. Consumers can
+    check leading whitespace to decide nesting.
 - `codeblock`:
-  - contained by `line` or `line_li`, because ">" can start a codeblock at the
+  - Contained by `line` or `line_li`, because ">" can start a codeblock at the
     end of any line.
-  - contains `line` nodes without `word` nodes: it's just the full raw text
+  - Contains `line` nodes without `word` nodes: it's just the full raw text
     line including whitespace. This is somewhat dictated by its "preformatted"
     nature; parsing the contents would require loading a "child" language
     (injection). See [#2](https://github.com/neovim/tree-sitter-vimdoc/issues/2).
-  - the terminating `<` (and any following whitespace) is discarded (anonymous).
+  - The terminating `<` (and any following whitespace) is discarded (anonymous).
 - `url` intentionally does not capture `.,)` at the end of the URL. See also [Known issues](#known-issues).
 - `h1` = "Heading 1": `======` followed by text and optional `*tags*`.
 - `h2` = "Heading 2": `------` followed by text and optional `*tags*`.
@@ -43,6 +46,12 @@ Known issues
 
 - Input must end with newline/EOL (`\n`). Grammar does not support files without EOL.
 - Input must end with a blank line. Though this doesn't seem to matter in practice.
+- Any line starting with `1.` (or other number) is treated as a listitem, even
+  if the first line of its `block` is not a listitem. Example:
+  ```
+  Foo was 0, not
+  1. Uh oh.
+  ```
 - Spec requires that `codeblock` delimiter ">" must be preceded by a space
   (" >"), not a tab. But currently the grammar doesn't enforce this. Example:
   `:help lcs-tab`.
@@ -93,3 +102,14 @@ Steps to perform a release: https://tree-sitter.github.io/tree-sitter/creating-p
    git push
    ```
 6. Tag and release: https://github.com/neovim/tree-sitter-vimdoc/releases/new
+
+### Publis to crates.io
+
+Crate: https://crates.io/crates/tree-sitter-vimdoc
+
+```
+cargo publish --dry-run
+cargo login
+cargo publish
+```
+

src/treesitter_vimdoc/Package.swift

@@ -13,7 +13,8 @@
 // @ts-check
 
 const _uppercase_word = /[A-Z0-9.()][-A-Z0-9.()_]+/;
-const _li_token = /[-•][ ]+/;
+// Listitem (incl. numbered items).
+const _li_token = /([-•]|([0-9]{1,3}\.))[ ]+/;
 
 module.exports = grammar({
   name: 'vimdoc',
@@ -49,9 +50,10 @@ module.exports = grammar({
       alias($.word_noli, $.word),
       $._atom_common,
     ),
+    // Word NOT matching (numbered) listitem.
     word_noli: ($) => choice(
-      // Lines contained by line_li must not start with a listitem symbol.
-      token(prec(-1, /[^-•\n\t ][^(\[\n\t ]*/)),
+      // Lines contained by line_li must not start with (numbered) listitem symbol.
+      token(prec(-1, /(([^-•\n\t ])|([^0-9\n\t ][^.\n\t ]))[^.(\[\n\t ]*/)),
       token(prec(-1, /[-•][^\n\t ]+/)),
       $._word_common,
     ),
@@ -164,7 +166,7 @@ module.exports = grammar({
     // Listitem: consumes prefixed line and all adjacent non-prefixed lines.
     line_li: ($) => prec.right(1, seq(
       optional(token.immediate('<')),  // Treat codeblock-terminating "<" as whitespace.
-      _li_token,
+      alias(_li_token, $.prefix),
       choice(
         alias(seq(repeat1($._atom), /\n/), $.line),
         seq(alias(repeat1($._atom), $.line), $.codeblock),