lib/rouge/lexers/jinja.rb in rouge-3.14.0 vs lib/rouge/lexers/jinja.rb in rouge-3.15.0

@@ -36,10 +36,11 @@
       end
 
       state :root do
         # Comments
         rule %r/{#/, Comment, :comment
+        rule %r/##.*/, Comment
 
         # Statements
         rule %r/\{\%/ do
           token Comment::Preproc
           push :statement
@@ -49,17 +50,17 @@
         rule %r/\{\{/ do
           token Comment::Preproc
           push :expression
         end
 
-        rule(/(.+?)(?=\\|{{|{%|{#)/m) { delegate parent }
+        rule(/(.+?)(?=\\|{{|{%|{#|##)/m) { delegate parent }
         rule(/.+/m) { delegate parent }
       end
 
       state :filter do
         # Filters are called like variable|foo(arg1, ...)
-        rule %r/(\|)(\w+)/ do
+        rule %r/(\|\s*)(\w+)/ do
           groups Operator, Name::Function
         end
       end
 
       state :function do
@@ -94,11 +95,12 @@
         rule %r/\(/, Punctuation
         rule %r/\)/, Punctuation
       end
 
       state :comment do
-        rule(/[^{#]+/m) { token Comment }
+        rule %r/[^#]+/m, Comment
         rule(/#}/) { token Comment; pop! }
+        rule %r/#/, Comment
       end
 
       state :expression do
         rule %r/\w+\.?/m, Name::Variable