From 93fa5df0a3f0aeb72df50a9d2110cb90fc5a0a13 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Sat, 1 Apr 2023 15:58:48 +0200 Subject: chore(help)!: renamed to vimdoc --- README.md | 4 ++-- lockfile.json | 6 +++--- lua/nvim-treesitter/parsers.lua | 17 +++++++++-------- queries/help/highlights.scm | 25 ------------------------- queries/help/injections.scm | 3 --- queries/vimdoc/highlights.scm | 25 +++++++++++++++++++++++++ queries/vimdoc/injections.scm | 3 +++ 7 files changed, 42 insertions(+), 41 deletions(-) delete mode 100644 queries/help/highlights.scm delete mode 100644 queries/help/injections.scm create mode 100644 queries/vimdoc/highlights.scm create mode 100644 queries/vimdoc/injections.scm diff --git a/README.md b/README.md index 2af898eb4..22b723059 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,7 @@ All modules are disabled by default and need to be activated explicitly in your ```lua require'nvim-treesitter.configs'.setup { -- A list of parser names, or "all" (the five listed parsers should always be installed) - ensure_installed = { "c", "lua", "vim", "help", "query" }, + ensure_installed = { "c", "lua", "vim", "vimdoc", "query" }, -- Install parsers synchronously (only applied to `ensure_installed`) sync_install = false, @@ -241,7 +241,6 @@ We are looking for maintainers to add more parsers and to write query files for - [ ] [haskell](https://github.com/tree-sitter/tree-sitter-haskell) - [x] [hcl](https://github.com/MichaHoffmann/tree-sitter-hcl) (maintained by @MichaHoffmann) - [x] [heex](https://github.com/connorlay/tree-sitter-heex) (maintained by @connorlay) -- [x] [help](https://github.com/neovim/tree-sitter-vimdoc) (maintained by @vigoux) - [x] [hjson](https://github.com/winston0410/tree-sitter-hjson) (maintained by @winston0410) - [x] [hlsl](https://github.com/theHamsta/tree-sitter-hlsl) (maintained by @theHamsta) - [x] [hocon](https://github.com/antosha417/tree-sitter-hocon) (maintained by @antosha417) @@ -348,6 +347,7 @@ We are looking for maintainers to add more parsers and to write query files for - [x] [verilog](https://github.com/tree-sitter/tree-sitter-verilog) (maintained by @zegervdv) - [x] [vhs](https://github.com/charmbracelet/tree-sitter-vhs) (maintained by @caarlos0) - [x] [vim](https://github.com/vigoux/tree-sitter-viml) (maintained by @vigoux) +- [x] [vimdoc](https://github.com/neovim/tree-sitter-vimdoc) (maintained by @clason) - [x] [vue](https://github.com/ikatyang/tree-sitter-vue) (maintained by @WhyNotHugo) - [x] [wgsl](https://github.com/szebniok/tree-sitter-wgsl) (maintained by @szebniok) - [x] [wgsl_bevy](https://github.com/theHamsta/tree-sitter-wgsl-bevy) (maintained by @theHamsta) diff --git a/lockfile.json b/lockfile.json index bec7df21f..327b68194 100644 --- a/lockfile.json +++ b/lockfile.json @@ -203,9 +203,6 @@ "heex": { "revision": "2e1348c3cf2c9323e87c2744796cf3f3868aa82a" }, - "help": { - "revision": "c4e23d265f022dcd51053c40d47cd06e7756a347" - }, "hjson": { "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0" }, @@ -524,6 +521,9 @@ "vim": { "revision": "e39a7bbcfdcfc7900629962b785c7e14503ae590" }, + "vimdoc": { + "revision": "b2ec4ec5f7be24cb6f7ccffafd7204477fe5784a" + }, "vue": { "revision": "91fe2754796cd8fba5f229505a23fa08f3546c06" }, diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua index c3c9bab6c..753ad51e5 100644 --- a/lua/nvim-treesitter/parsers.lua +++ b/lua/nvim-treesitter/parsers.lua @@ -641,14 +641,6 @@ list.heex = { maintainers = { "@connorlay" }, } -list.help = { - install_info = { - url = "https://github.com/neovim/tree-sitter-vimdoc", - files = { "src/parser.c" }, - }, - maintainers = { "@vigoux" }, -} - list.hjson = { install_info = { url = "https://github.com/winston0410/tree-sitter-hjson", @@ -1550,6 +1542,15 @@ list.vim = { maintainers = { "@vigoux" }, } +list.vimdoc = { + install_info = { + url = "https://github.com/neovim/tree-sitter-vimdoc", + files = { "src/parser.c" }, + }, + filetype = "help", + maintainers = { "@clason" }, +} + list.vue = { install_info = { url = "https://github.com/ikatyang/tree-sitter-vue", diff --git a/queries/help/highlights.scm b/queries/help/highlights.scm deleted file mode 100644 index c0d88301b..000000000 --- a/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/queries/help/injections.scm b/queries/help/injections.scm deleted file mode 100644 index 09bbe44e8..000000000 --- a/queries/help/injections.scm +++ /dev/null @@ -1,3 +0,0 @@ -(codeblock - (language) @language - (code) @content) diff --git a/queries/vimdoc/highlights.scm b/queries/vimdoc/highlights.scm new file mode 100644 index 000000000..c0d88301b --- /dev/null +++ b/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/queries/vimdoc/injections.scm b/queries/vimdoc/injections.scm new file mode 100644 index 000000000..09bbe44e8 --- /dev/null +++ b/queries/vimdoc/injections.scm @@ -0,0 +1,3 @@ +(codeblock + (language) @language + (code) @content) -- cgit v1.2.3-70-g09d2