diff options
| author | ObserverOfTime <chronobserver@disroot.org> | 2024-04-20 00:29:52 +0300 |
|---|---|---|
| committer | ObserverOfTime <chronobserver@disroot.org> | 2024-04-20 09:31:58 +0300 |
| commit | d8bf42b2621f5af274ccd4ac3f742caea04723b4 (patch) | |
| tree | a3760cd693e6dea7a519930596e56bf623021bb0 | |
| parent | fix(vimscript): miscellaneous fixups (diff) | |
| download | nvim-treesitter-d8bf42b2621f5af274ccd4ac3f742caea04723b4.tar nvim-treesitter-d8bf42b2621f5af274ccd4ac3f742caea04723b4.tar.gz nvim-treesitter-d8bf42b2621f5af274ccd4ac3f742caea04723b4.tar.bz2 nvim-treesitter-d8bf42b2621f5af274ccd4ac3f742caea04723b4.tar.lz nvim-treesitter-d8bf42b2621f5af274ccd4ac3f742caea04723b4.tar.xz nvim-treesitter-d8bf42b2621f5af274ccd4ac3f742caea04723b4.tar.zst nvim-treesitter-d8bf42b2621f5af274ccd4ac3f742caea04723b4.zip | |
feat(dockerfile): adapt for parser update
| -rw-r--r-- | lockfile.json | 2 | ||||
| -rw-r--r-- | lua/nvim-treesitter/parsers.lua | 2 | ||||
| -rw-r--r-- | queries/dockerfile/highlights.scm | 9 | ||||
| -rw-r--r-- | queries/dockerfile/injections.scm | 8 |
4 files changed, 18 insertions, 3 deletions
diff --git a/lockfile.json b/lockfile.json index 17723a6d6..e3e33d021 100644 --- a/lockfile.json +++ b/lockfile.json @@ -120,7 +120,7 @@ "revision": "63f176e7db5fca073b55b98b7e5e95afd1587fcb" }, "dockerfile": { - "revision": "33e22c33bcdbfc33d42806ee84cfd0b1248cc392" + "revision": "439c3e7b8a9bfdbf1f7d7c2beaae4173dc484cbf" }, "dot": { "revision": "9ab85550c896d8b294d9b9ca1e30698736f08cea" diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua index 8e69192cd..b1f9ececd 100644 --- a/lua/nvim-treesitter/parsers.lua +++ b/lua/nvim-treesitter/parsers.lua @@ -413,7 +413,7 @@ list.djot = { list.dockerfile = { install_info = { url = "https://github.com/camdencheek/tree-sitter-dockerfile", - files = { "src/parser.c" }, + files = { "src/parser.c", "src/scanner.c" }, }, maintainers = { "@camdencheek" }, } diff --git a/queries/dockerfile/highlights.scm b/queries/dockerfile/highlights.scm index 762e34426..5a8f0c7cc 100644 --- a/queries/dockerfile/highlights.scm +++ b/queries/dockerfile/highlights.scm @@ -36,6 +36,15 @@ (double_quoted_string) @string +[ + (heredoc_marker) + (heredoc_end) +] @label + +((heredoc_block + (heredoc_line) @string) + (#set! "priority" 90)) + (expansion [ "$" diff --git a/queries/dockerfile/injections.scm b/queries/dockerfile/injections.scm index 0304f982e..5d3bbffb7 100644 --- a/queries/dockerfile/injections.scm +++ b/queries/dockerfile/injections.scm @@ -1,6 +1,12 @@ ((comment) @injection.content (#set! injection.language "comment")) -((shell_command) @injection.content +((shell_command + (shell_fragment) @injection.content) + (#set! injection.language "bash") + (#set! injection.combined)) + +((run_instruction + (heredoc_block) @injection.content) (#set! injection.language "bash") (#set! injection.include-children)) |