languages.toml

@@ -4323,4 +4323,4 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "pug"
-source = { git = "https://github.com/zealot128/tree-sitter-pug", rev = "13e9195370172c86a8b88184cc358b23b677cc46" }
+source = { git = "https://github.com/codepen/tree-sitter-pug", rev = "60a463fd725afd034045496b9018fa4a081469fd" }

runtime/queries/pug/highlights.scm

@@ -6,7 +6,20 @@
   ((doctype_name) @type.enum.variant)
 )
 
+; Tags
 (tag_name) @constant
+(
+  link_tag
+  ("link" @constant)
+)
+(
+  script_tag
+  ("script" @constant)
+)
+(
+  style_tag
+  ("style" @constant)
+)
 
 ; Attributes
 (id) @attribute
@@ -16,10 +29,7 @@
 (quoted_attribute_value) @string
 
 ; Controls
-(
+; NOTE: The grammar currently seems to be missing the "if" conditional
-  conditional
-  ((keyword) @keyword.control.conditional)
-)
 (
   case
   ((keyword) @keyword.control)
@@ -31,10 +41,12 @@
 (
   each
   ((keyword) @keyword.control.repeat)
-)
+  ((iteration_variable) @variable)
-(
+  ((keyword) @keyword.operator)
-  else
+  (
-  ((keyword) @keyword.control.conditional)
+    else
+    ((keyword) @keyword.control.conditional)
+  )
 )
 (
   while
@@ -74,11 +86,13 @@
 (
   block_append
   ((keyword) @keyword.directive)
+  ((keyword) @keyword.directive)
   ((block_name) @function.method)
 )
 (
   block_prepend
   ((keyword) @keyword.directive)
+  ((keyword) @keyword.directive)
   ((block_name) @function.method)
 )
 
@@ -93,5 +107,5 @@
 ; Inline JavaScript
 (
   unbuffered_code
-  (("-") @special)
+  (("-") @operator)
 )