Merge branch 'st4134'

Author: deathaxe

Syntaxes/Liquid.sublime-syntax

@@ -162,6 +162,7 @@ contexts:
 
   liquid-statement-tag-body:
     - include: jekyll-links
+    - include: liquid-block-comments
     - include: liquid-line-comments
     - include: liquid-assignments
     - include: liquid-conditionals
@@ -220,6 +221,17 @@ contexts:
 
 ###[ LIQUID COMMENTS ]########################################################
 
+  liquid-block-comments:
+    - match: \bcomment\b
+      scope: keyword.declaration.comment.liquid
+      push: liquid-block-comment-body
+
+  liquid-block-comment-body:
+    - meta_content_scope: comment.block.liquid
+    - match: \bendcomment\b
+      scope: keyword.declaration.comment.liquid
+      pop: 1
+
   liquid-line-comments:
     - match: \#+
       scope: punctuation.definition.comment.liquid

tests/syntax_test_liquid.liquid.html

@@ -32,6 +32,17 @@
 | ^ punctuation.definition.comment.liquid
 %}
 
+
+{% liquid
+
+  comment
+| ^^^^^^^ meta.statement.liquid keyword.declaration.comment.liquid - comment
+  commented text
+| ^^^^^^^^^^^^^^^ comment.block.liquid
+  endcomment
+| ^^^^^^^^^^ meta.statement.liquid keyword.declaration.comment.liquid - comment
+%}
+
 {% if true %}
 | <- meta.embedded.liquid source.liquid meta.statement.liquid punctuation.section.embedded.begin.liquid
 |^^^^^^^^^^^^ meta.embedded.liquid source.liquid meta.statement.liquid