From 2661e05b3405c216a2303c20e71830b4bde7ac35 Mon Sep 17 00:00:00 2001
From: blinxen <h-k-81@hotmail.com>
Date: Thu, 25 Jan 2024 06:12:17 +0100
Subject: [PATCH] Update some grammars to a commit where the license file is
included (#9279)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
languages.toml | 8 +-
runtime/queries/pod/highlights.scm | 120 +++++++++++++++++---------
runtime/queries/unison/highlights.scm | 2 +-
runtime/queries/vhs/highlights.scm | 21 +++--
4 files changed, 98 insertions(+), 53 deletions(-)
diff --git a/languages.toml b/languages.toml
index 83c77047..87d4ae23 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1249,7 +1249,7 @@ file-types = ["pod"]
[[grammar]]
name = "pod"
-source = { git = "https://github.com/tree-sitter-perl/tree-sitter-pod", rev = "d466b84009a63986834498073ec05d58d727d55f" }
+source = { git = "https://github.com/tree-sitter-perl/tree-sitter-pod", rev = "39da859947b94abdee43e431368e1ae975c0a424" }
[[language]]
name = "racket"
@@ -2259,7 +2259,7 @@ grammar = "vhs"
[[grammar]]
name = "vhs"
-source = { git = "https://github.com/charmbracelet/tree-sitter-vhs", rev = "c6d81f34c011c29ee86dd73b45a8ecc9f2e2bdaf" }
+source = { git = "https://github.com/charmbracelet/tree-sitter-vhs", rev = "9534865e614c95eb9418e5e73f061c32fa4d9540" }
[[language]]
name = "kdl"
@@ -2666,7 +2666,7 @@ language-servers = [ "cs" ]
[[grammar]]
name = "smithy"
-source = { git = "https://github.com/indoorvivants/tree-sitter-smithy", rev = "cf8c7eb9faf7c7049839585eac19c94af231e6a0" }
+source = { git = "https://github.com/indoorvivants/tree-sitter-smithy", rev = "8327eb84d55639ffbe08c9dc82da7fff72a1ad07" }
[[language]]
name = "vhdl"
@@ -2917,7 +2917,7 @@ indent = { tab-width = 4, unit = " " }
[[grammar]]
name = "unison"
-source = { git = "https://github.com/kylegoetz/tree-sitter-unison", rev = "98c4e8bc5c9f5989814a720457cf36963cf4043d" }
+source = { git = "https://github.com/kylegoetz/tree-sitter-unison", rev = "aaec316774c8b50d367ec7cf26523aac5ef0cfc5" }
[[language]]
name = "todotxt"
diff --git a/runtime/queries/pod/highlights.scm b/runtime/queries/pod/highlights.scm
index e8bd4b54..d88d9ffa 100644
--- a/runtime/queries/pod/highlights.scm
+++ b/runtime/queries/pod/highlights.scm
@@ -1,61 +1,97 @@
-[(pod_directive)
- (head_directive)
- (over_directive)
- (item_directive)
- (back_directive)
- (encoding_directive)
- (cut_directive)] @tag
+; A highlight file for nvim-treesitter to use
-(head_paragraph
- (head_directive) @directive
- (#eq? @directive "=head1")
+[(pod_command)
+ (command)
+ (cut_command)] @keyword
+
+(command_paragraph
+ (command) @keyword
+ (#eq? @keyword "=head1")
(content) @markup.heading.1)
-(head_paragraph
- (head_directive) @directive
- (#eq? @directive "=head2")
+
+(command_paragraph
+ (command) @keyword
+ (#eq? @keyword "=head2")
(content) @markup.heading.2)
-(head_paragraph
- (head_directive) @directive
- (#eq? @directive "=head3")
+
+(command_paragraph
+ (command) @keyword
+ (#eq? @keyword "=head3")
(content) @markup.heading.3)
-(head_paragraph
- (head_directive) @directive
- (#eq? @directive "=head4")
+
+(command_paragraph
+ (command) @keyword
+ (#eq? @keyword "=head4")
(content) @markup.heading.4)
-(head_paragraph
- (head_directive) @directive
- (#eq? @directive "=head5")
+
+(command_paragraph
+ (command) @keyword
+ (#eq? @keyword "=head5")
(content) @markup.heading.5)
-(head_paragraph
- (head_directive) @directive
- (#eq? @directive "=head6")
+
+(command_paragraph
+ (command) @keyword
+ (#eq? @keyword "=head6")
(content) @markup.heading.6)
-(over_paragraph (content) @constant.numeric.integer)
-(item_paragraph (content) @markup.list)
-(encoding_paragraph (content) @string)
+(command_paragraph
+ (command) @keyword
+ (#match? @keyword "^=over")
+ (content) @constant.numeric)
+
+(command_paragraph
+ (command) @keyword
+ (#match? @keyword "^=item")
+ (content) @markup)
+
+(command_paragraph
+ (command) @keyword
+ (#match? @keyword "^=encoding")
+ (content) @string.special)
+
+(command_paragraph
+ (command) @keyword
+ (#not-match? @keyword "^=(head|over|item|encoding)")
+ (content) @string)
(verbatim_paragraph (content) @markup.raw)
-(interior_sequence) @tag
+(interior_sequence
+ (sequence_letter) @constant.character
+ ["<" ">"] @punctuation.delimiter
+)
(interior_sequence
- (sequence_letter) @letter
- (#eq? @letter "B")
+ (sequence_letter) @character
+ (#eq? @character "B")
(content) @markup.bold)
+
(interior_sequence
- (sequence_letter) @letter
- (#eq? @letter "C")
- (content) @markup.raw)
+ (sequence_letter) @character
+ (#eq? @character "C")
+ (content) @markup.literal)
+
(interior_sequence
- (sequence_letter) @letter
- (#eq? @letter "F")
- (content) @markup.italic)
+ (sequence_letter) @character
+ (#eq? @character "F")
+ (content) @markup.underline @string.special)
+
(interior_sequence
- (sequence_letter) @letter
- (#eq? @letter "I")
- (content) @markup.italic)
+ (sequence_letter) @character
+ (#eq? @character "I")
+ (content) @markup.bold)
+
(interior_sequence
- (sequence_letter) @letter
- (#eq? @letter "L")
+ (sequence_letter) @character
+ (#eq? @character "L")
(content) @markup.link.url)
+
+(interior_sequence
+ (sequence_letter) @character
+ (#eq? @character "X")
+ (content) @markup.reference)
+
+(interior_sequence
+ (sequence_letter) @character
+ (#eq? @character "E")
+ (content) @string.special.escape)
diff --git a/runtime/queries/unison/highlights.scm b/runtime/queries/unison/highlights.scm
index 956dc582..d58285ed 100644
--- a/runtime/queries/unison/highlights.scm
+++ b/runtime/queries/unison/highlights.scm
@@ -63,7 +63,7 @@
;; Terms
(type_signature term_name: (path)? @variable term_name: (wordy_id) @variable)
(type_signature (wordy_id) @type)
-(type_signature (delayed (wordy_id)) @type)
+(type_signature (term_type(delayed(wordy_id))) @type)
(term_definition param: (wordy_id) @variable.parameter)
diff --git a/runtime/queries/vhs/highlights.scm b/runtime/queries/vhs/highlights.scm
index 9a2d05cf..a7e1af30 100644
--- a/runtime/queries/vhs/highlights.scm
+++ b/runtime/queries/vhs/highlights.scm
@@ -1,4 +1,4 @@
-[
+[
"Output"
"Backspace"
"Down"
@@ -15,22 +15,31 @@
"Hide"
"Show" ] @keyword
-[ "FontFamily"
+[ "Shell"
+ "FontFamily"
"FontSize"
"Framerate"
+ "PlaybackSpeed"
"Height"
"LetterSpacing"
"TypingSpeed"
"LineHeight"
"Padding"
"Theme"
- "Width" ] @type
+ "LoopOffset"
+ "Width"
+ "BorderRadius"
+ "Margin"
+ "MarginFill"
+ "WindowBar"
+ "WindowBarSize"
+ "CursorBlink" ] @type
[ "@" ] @operator
(control) @function.macro
(float) @constant.numeric.float
(integer) @constant.numeric.integer
(comment) @comment
-(path) @string.special.path
-[(string) (json)] @string
-(time) @string.special.symbol
\ No newline at end of file
+[(path) (string) (json)] @string.special.path
+(time) @string.special.symbol
+(boolean) @constant.builtin.boolean