lib/rouge/lexers/liquid.rb in rouge-1.8.0 vs lib/rouge/lexers/liquid.rb in rouge-1.9.0

@@ -129,13 +129,11 @@
 
         rule /\b((!)|(not\b))/ do
           groups nil, Operator, Operator::Word
         end
 
-        rule /([\w\.\'"]+)(\s+)(contains)(\s+)([\w\.\'"]+)/ do
-          groups nil, Text::Whitespace, Operator::Word, Text::Whitespace
-        end
+        rule /(contains)/, Operator::Word
 
         mixin :generic
         mixin :whitespace
       end
 
@@ -166,20 +164,20 @@
       end
 
       # states for unknown markup
       state :param_markup do
         mixin :whitespace
+        mixin :string
 
         rule /([^\s=:]+)(\s*)(=|:)/ do
           groups Name::Attribute, Text::Whitespace, Operator
         end
 
         rule /(\{\{)(\s*)([^\s\}])(\s*)(\}\})/ do
           groups Punctuation, Text::Whitespace, nil, Text::Whitespace, Punctuation
         end
 
-        mixin :string
         mixin :number
         mixin :keyword
 
         rule /,/, Punctuation
       end
@@ -194,16 +192,16 @@
         mixin :variable
         rule /./, Text
       end
 
       state :tag_markup do
-        rule (/%\}/) { token Punctuation; reset_stack }
+        mixin :end_of_block
         mixin :default_param_markup
       end
 
       state :variable_tag_markup do
-        rule (/%\}/) { token Punctuation; reset_stack }
+        mixin :end_of_block
         mixin :variable_param_markup
       end
 
       # states for different values types
       state :keyword do
@@ -223,11 +221,17 @@
       state :number do
         rule /\d+\.\d+/, Num::Float
         rule /\d+/, Num::Integer
       end
 
+      state :array_index do
+        rule /\[/, Punctuation
+        rule /\]/, Punctuation
+      end
+
       state :generic do
+        mixin :array_index
         mixin :keyword
         mixin :string
         mixin :variable
         mixin :number
       end
@@ -256,9 +260,10 @@
         rule /\{/, Text
       end
 
       state :assign do
         mixin :whitespace
+        mixin :end_of_block
 
         rule /(\s*)(=)(\s*)/ do
           groups Text::Whitespace, Operator, Text::Whitespace
         end