From ec85fb9ab6ff8a46f5a09d7e1134b153464dd08a Mon Sep 17 00:00:00 2001
From: Clay <connorlay@users.noreply.github.com>
Date: Sat, 23 Jul 2022 21:49:52 -0500
Subject: [PATCH] Improve HEEx comment highlights, inject comment lang (#3170)

---
 runtime/queries/heex/highlights.scm | 12 +++++++-----
 runtime/queries/heex/injections.scm |  3 +++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/runtime/queries/heex/highlights.scm b/runtime/queries/heex/highlights.scm
index 6d8816de9..75537fa71 100644
--- a/runtime/queries/heex/highlights.scm
+++ b/runtime/queries/heex/highlights.scm
@@ -2,14 +2,10 @@
 ; HEEx delimiters
 [
   "<!"
-  "<!--"
   "<"
-  "<%!--"
   "<%#"
   ">"
   "</"
-  "--%>"
-  "-->"
   "/>"
   ; These could be `@keyword`s but the closing `>` wouldn't be highlighted
   ; as `@keyword`
@@ -34,7 +30,13 @@
 (doctype) @constant
 
 ; HEEx comments are highlighted as such
-(comment) @comment
+[
+  "<!--"
+  "-->"
+  "<%!--"
+  "--%>"
+  (comment)
+] @comment
 
 ; HEEx tags are highlighted as HTML
 (tag_name) @tag
diff --git a/runtime/queries/heex/injections.scm b/runtime/queries/heex/injections.scm
index ad4e4faa8..d97e4b3ef 100644
--- a/runtime/queries/heex/injections.scm
+++ b/runtime/queries/heex/injections.scm
@@ -19,3 +19,6 @@
 ;     <link href={ Routes.static_path(..) } />
 ((expression (expression_value) @injection.content)
  (#set! injection.language "elixir"))
+
+((comment) @injection.content 
+ (#set! injection.language "comment"))
\ No newline at end of file