Additional quasi-quotation scope

sheaf · sheaf · commit 4c9905eef69d · 2020-10-16T20:13:16.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Proper highlighting of lambda case, including fixing the highlighting of subsequent braces (which were wrongly highlighted as record syntax).
 - Recognize indented `\begin{code}` boundary in literate haskell files.
 - Fix highlighting of symbolic data constructors within fixity declarations (e.g. `infixl 9 :$`).
+- Add `meta.embedded.block.{quasi-quoter}` scope to quasi-quotations.
 
 ## 3.3.0 - 25.06.2020
 
diff --git a/syntaxes/haskell.YAML-tmLanguage b/syntaxes/haskell.YAML-tmLanguage
@@ -1735,21 +1735,20 @@ repository:
           (?x)
             (\[)
             (?:(\$\$)|(\$))?
-            (?!'\|') # Don't parse ['|'...] as a quasi quotation
-            ((?:[^\s\p{S}\p{P}]|[\.'_])*)
+            (?!'\|')                                             # Don't parse ['|'...] as a quasi quotation
+            ((?:[\p{Lu}\p{Lt}][\p{Ll}_\p{Lu}\p{Lt}\p{Nd}']*\.)*) # Optional qualifier
+            ((?:[^\s\p{S}\p{P}]|['_])*)                          # Quasi-quoter
             (\|\|?)
         beginCaptures:
           '1': {name: keyword.operator.quasi-quotation.begin.haskell}
           '2': {name: keyword.operator.prefix.double-dollar.haskell}
           '3': {name: keyword.operator.prefix.dollar.haskell}
-          '4':
-            patterns:
-              - include: '#qualifier'
-            name: entity.name.quasi-quoter.haskell
-          '5': {name: keyword.operator.quasi-quotation.begin.haskell}
-        end: '\5\]'
+          '4': {name: entity.name.namespace.haskell}
+          '5': {name: entity.name.quasi-quoter.haskell}
+          '6': {name: keyword.operator.quasi-quotation.begin.haskell}
+        end: '\6\]'
         endCaptures:
           '0': {name: keyword.operator.quasi-quotation.end.haskell}
-        name: meta.quasi-quotation.haskell
+        name: "meta.quasi-quotation.haskell meta.embedded.block.$5"
 scopeName: source.haskell
 uuid: 5C034675-1F6D-497E-8073-369D37E2FD7D
diff --git a/test/tests/QuasiQuotes.hs b/test/tests/QuasiQuotes.hs
@@ -48,16 +48,18 @@
 
     <HTML>
 --  ^^^^^^ meta.quasi-quotation.haskell
+--  ^^^^^^ meta.embedded.block.html
     |]
 --  ^^ keyword.operator.quasi-quotation.end.haskell
 --  ^^ meta.quasi-quotation.haskell
 
-    [Mod.xml'| <xml /> |]
---  ^        ^ keyword.operator.quasi-quotation.begin.haskell
+    [Mod.xml| <xml /> |]
+--  ^       ^ keyword.operator.quasi-quotation.begin.haskell
 --   ^^^^ entity.name.namespace.haskell
---       ^^^^ entity.name.quasi-quoter.haskell
---                     ^^ keyword.operator.quasi-quotation.end.haskell
---  ^^^^^^^^^^^^^^^^^^^^^ meta.quasi-quotation.haskell
+--       ^^^ entity.name.quasi-quoter.haskell
+--                    ^^ keyword.operator.quasi-quotation.end.haskell
+--  ^^^^^^^^^^^^^^^^^^^^ meta.quasi-quotation.haskell
+--            ^^^^^^^ meta.embedded.block.xml
 
     [a'|'xyz|]
 --   ^^ entity.name.quasi-quoter.haskell
