Merge branch 'develop'

Author: deathaxe

Syntaxes/Liquid.sublime-syntax

@@ -162,6 +162,7 @@ contexts:
 
   liquid-tag-statements:
     - include: jekyll-links
+    - include: liquid-line-comments
     - include: liquid-assignments
     - include: liquid-conditionals
     - include: liquid-iterations
@@ -197,6 +198,7 @@ contexts:
 
   liquid-object-content:
     - include: jekyll-variables
+    - include: liquid-line-comments
     - include: liquid-constants
     - include: liquid-filters
     - include: liquid-item-access
@@ -216,6 +218,18 @@ contexts:
       scope: support.function.liquid
       push: liquid-tag-expression
 
+###[ LIQUID COMMENTS ]########################################################
+
+  liquid-line-comments:
+    - match: \#+
+      scope: punctuation.definition.comment.liquid
+      push: liquid-line-comment-body
+
+  liquid-line-comment-body:
+    - meta_scope: comment.line.number-sign.liquid
+    - match: \n
+      pop: 1
+
 ###[ LIQUID CONTITIONALS ]####################################################
 
   liquid-conditionals:

tests/syntax_test_liquid.liquid.html

@@ -5,6 +5,33 @@
  --- https://shopify.github.io/liquid/tags/control-flow
  -->
 
+{% # for i in (1..3) -%}
+|^^^^^^^^^^^^^^^^^^^^^^^ meta.embedded.liquid source.liquid meta.statement.liquid
+|  ^^^^^^^^^^^^^^^^^^ comment.line.number-sign.liquid
+|  ^ punctuation.definition.comment.liquid
+|                    ^^^ punctuation.section.embedded.end.liquid - comment
+  {{ i }}
+{% # endfor %}
+|^^^^^^^^^^^^^ meta.embedded.liquid source.liquid meta.statement.liquid
+|  ^^^^^^^^^ comment.line.number-sign.liquid
+|  ^ punctuation.definition.comment.liquid
+|           ^^ punctuation.section.embedded.end.liquid - comment
+
+{%
+  ###############################
+  # This is a comment
+  # across multiple lines
+  ###############################
+| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.embedded.liquid source.liquid meta.statement.liquid comment.line.number-sign.liquid punctuation.definition.comment.liquid
+%}
+| <- meta.embedded.liquid source.liquid meta.statement.liquid punctuation.section.embedded.end.liquid - comment
+
+{% liquid
+  # this is a comment
+| ^^^^^^^^^^^^^^^^^^^^ meta.embedded.liquid source.liquid meta.statement.liquid comment.line.number-sign.liquid
+| ^ punctuation.definition.comment.liquid
+%}
+
 {% if true %}
 | <- meta.embedded.liquid source.liquid meta.statement.liquid punctuation.section.embedded.begin.liquid
 |^^^^^^^^^^^^ meta.embedded.liquid source.liquid meta.statement.liquid