Fix xhp commenting syntax.

Reviewed By: matthewwithanm Differential Revision: D9978898 fbshipit-source-id: 01ece5bdac2c70ec8e742204b69b284627ec9b43
facebookarchive · Sep 22, 2018 · e659438 · e659438
1 parent 3ea855d
commit e659438
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/pkg/nuclide-language-hack/grammars/hack.cson b/pkg/nuclide-language-hack/grammars/hack.cson
@@ -2246,6 +2246,7 @@
         },
         "patterns": [
           { "include": "#xhp-tag-termination" },
+          { "include": "#xhp-html-comments"},
           { "include": "#xhp-tag-attributes" }
         ]
       }
@@ -2256,7 +2257,7 @@
       {
         "comment": "this matches the end > of an opening tag when in the form <tag> </tag>",
         "comment": "uses non consuming search for </ in </tag>",
-        "begin": "(>)",
+        "begin": "(?<!--)(>)",
         "end": "(</)",
         "beginCaptures": {
           "0": { "name": "punctuation.definition.tag.xhp" },

diff --git a/pkg/nuclide-language-hack/spec/fixtures/syntax_test_xhp.php b/pkg/nuclide-language-hack/spec/fixtures/syntax_test_xhp.php
@@ -53,3 +53,15 @@ function exampleXHPBracketHighlighting() {
     </Test>
   )
 }
+
+function exampleXHPComments() {
+  return (
+    <ui:foo
+      <!--attr={'test'}-->
+//    ^ comment.block.html punctuation.definition.comment.html
+    />
+    if (true) {
+//            ^ punctuation.section.scope.begin.php
+    }
+  )
+}