Merge branch 'master' into dependabot/npm_and_yarn/micromatch-4.0.8

Author: brandenrodgers

CHANGELOG.md

@@ -3,21 +3,26 @@
 All notable changes to the HubSpot VS Code extension will be documented in this file.
 
 ## [1.3.2]
+
 - Fix to telemetry
 
 ## [1.3.1]
+
 - Minor bug fixes to module creation and fetch
 
 ## [1.3.0]
+
 - Fix `is not` token in highlighting
 - Minor updates to feedback form
 - Updated HubL snippets
 - Migrates from using HubSpot `cli-lib` to `local-dev-lib`
 
 ## [1.2.2]
+
 - Remote directory contents now properly sort alphabetically
 
 ## [1.2.1]
+
 - Adds HubL auto-detect. Will now prompt to switch project language when HubL is detected.
 
 ## [1.1.1]

syntaxes/hubl.json

@@ -2,10 +2,26 @@
   "name": "hubl",
   "scopeName": "source.hubl",
   "comment": "hubl Templates",
-  "injectionSelector": "L:text.css.hubl, L:text.html.hubl",
+  "injectionSelector": "L:text.css.hubl - comment, L:text.html.hubl - comment",
   "foldingStartMarker": "({%\\s*(block|filter|for|if|macro|raw))",
   "foldingStopMarker": "({%\\s*(endblock|endfilter|endfor|endif|endmacro|endraw)\\s*%})",
   "patterns": [
+    {
+      "begin": "{#-?",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.comment.begin.hubl"
+        }
+      },
+      "end": "-?#}",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.comment.end.hubl"
+        }
+      },
+      "name": "comment.block.hubl",
+      "contentName": "comment.block.hubl"
+    },
     {
       "begin": "({%)\\s*(raw)\\s*(%})",
       "captures": {
@@ -22,16 +38,6 @@
       "end": "({%)\\s*(endraw)\\s*(%})",
       "name": "comment.block.hubl.raw"
     },
-    {
-      "begin": "{#-?",
-      "captures": [
-        {
-          "name": "entity.other.hubl.delimiter.comment"
-        }
-      ],
-      "end": "-?#}",
-      "name": "comment.block.hubl"
-    },
     {
       "begin": "{{-?",
       "captures": [