From 2d6bf406ddd3e973d99801fe5ebb0a4a6d461621 Mon Sep 17 00:00:00 2001
From: Sam Doiron <samuel.doiron@shopify.com>
Date: Fri, 29 Jan 2021 17:06:16 -0500
Subject: [PATCH] update grammar to support #

---
 lib/liquid/block_body.rb                | 2 +-
 test/integration/inline_comment_test.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/liquid/block_body.rb b/lib/liquid/block_body.rb
index 76ab0a8..3ab92a8 100644
--- a/lib/liquid/block_body.rb
+++ b/lib/liquid/block_body.rb
@@ -4,7 +4,7 @@ require 'English'
 
 module Liquid
   class BlockBody
-    LiquidTagToken      = /\A\s*(\w+)\s*(.*?)\z/o
+    LiquidTagToken      = /\A\s*([\w#]+)\s*(.*?)\z/o
     FullToken           = /\A#{TagStart}#{WhitespaceControl}?(\s*)(\w+)(\s*)(.*?)#{WhitespaceControl}?#{TagEnd}\z/om
     ContentOfVariable   = /\A#{VariableStart}#{WhitespaceControl}?(.*?)#{WhitespaceControl}?#{VariableEnd}\z/om
     WhitespaceOrNothing = /\A\s*\z/
diff --git a/test/integration/inline_comment_test.rb b/test/integration/inline_comment_test.rb
index f02acb7..ae5b953 100644
--- a/test/integration/inline_comment_test.rb
+++ b/test/integration/inline_comment_test.rb
@@ -7,7 +7,7 @@ class InlineCommentTest < Minitest::Test
 
   def test_basic_usage
     template_source = <<-END_TEMPLATE
-    foo{% -- this is a comment %}bar
+    foo{% # this is a comment %}bar
     END_TEMPLATE
     template        = Template.parse(template_source)
     rendered        = template.render!