liquid: support inline comments proposal

rouge-ruby · Mar 3, 2021 · 84e6cff · 84e6cff
1 parent 68ea48b
commit 84e6cff
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/rouge/lexers/liquid.rb b/lib/rouge/lexers/liquid.rb
@@ -38,6 +38,8 @@ class Liquid < RegexLexer
             pop! until state? :liquid
           end
         end
+
+        mixin :whitespace
       end
 
       state :end_output do
@@ -106,6 +108,8 @@ class Liquid < RegexLexer
 
         # custom tags or blocks
         rule %r/(\w+)\b/, Name::Tag, :block_args
+
+        mixin :end_logic
       end
 
       state :output do
@@ -231,6 +235,8 @@ class Liquid < RegexLexer
 
       state :filter do
         rule %r/[a-zA-Z_](?:\w|-(?![%}]))*/, Name::Function, :pop!
+
+        mixin :whitespace
       end
 
       state :args do
@@ -255,6 +261,7 @@ class Liquid < RegexLexer
 
       state :whitespace do
         rule %r/\s+/, Text::Whitespace
+        rule %r/(#-?\s(?:[^-%}\n]|-(?!%})|[%}](?!}))*\s*)+/, Comment
       end
 
       state :number do

diff --git a/spec/visual/samples/liquid b/spec/visual/samples/liquid
@@ -119,15 +119,17 @@ Some other {{ output }}!
 {% endfor %}
 
 {% for char in 'The Quick Brown Fox' %}
-  {{ char | upcase }}
+  {{ char | upcase # inline comment }}
 {% endfor %}
 
 {% for char in "Hello World" reversed %}
   {% echo char | url_encode %}
-{% endfor %}
+{% endfor
+  # inline comment %}
 
 {% liquid %}
 {% liquid
+  # inline comment
   assign size = "one two" | split: " "
   for value in size
     echo value