Fix regex for matching endraw tags

Gemfile

@@ -22,6 +22,6 @@ group :test do
   gem 'rubocop-performance', require: false
 
   platform :mri, :truffleruby do
-    gem 'liquid-c', github: 'Shopify/liquid-c', ref: 'pz-range-var-float'
+    gem 'liquid-c', github: 'Shopify/liquid-c', ref: 'master'
   end
 end

lib/liquid/block.rb

@@ -77,9 +77,6 @@ module Liquid
         body.parse(tokens, parse_context) do |end_tag_name, end_tag_params|
           @blank &&= body.blank?
 
-          # Instrument for bug 1346
-          Usage.increment("end_tag_params") if end_tag_params && !end_tag_params.empty?
-
           return false if end_tag_name == block_delimiter
           raise_tag_never_closed(block_name) unless end_tag_name
 

lib/liquid/forloop_drop.rb

@@ -9,12 +9,7 @@ module Liquid
       @index      = 0
     end
 
-    attr_reader :length, :parentloop
-
-    def name
-      Usage.increment('forloop_drop_name')
-      @name
-    end
+    attr_reader :name, :length, :parentloop
 
     def index
       @index + 1

lib/liquid/locales/en.yml

@@ -20,6 +20,7 @@
       tag_termination: "Tag '%{token}' was not properly terminated with regexp: %{tag_end}"
       variable_termination: "Variable '%{token}' was not properly terminated with regexp: %{tag_end}"
       tag_never_closed: "'%{block_name}' tag was never closed"
+      meta_syntax_error: "Liquid syntax error: #{e.message}"
       table_row: "Syntax Error in 'table_row loop' - Valid syntax: table_row [item] in [collection] cols=3"
       render: "Syntax error in tag 'render' - Template name must be a quoted string"
     argument:

lib/liquid/range_lookup.rb

@@ -29,7 +29,7 @@ module Liquid
       case input
       when Integer
         input
-      when NilClass, String, Float
+      when NilClass, String
         input.to_i
       else
         Utils.to_integer(input)

lib/liquid/tags/for.rb

@@ -198,7 +198,6 @@ module Liquid
       case key
       when 'offset'
         @from = if expr == 'continue'
-          Usage.increment('for_offset_continue')
           :continue
         else
           parse_expression(expr)

lib/liquid/tags/raw.rb

@@ -3,7 +3,7 @@
 module Liquid
   class Raw < Block
     Syntax = /\A\s*\z/
-    FullTokenPossiblyInvalid = /\A(.*)#{TagStart}\s*(\w+)\s*(.*)?#{TagEnd}\z/om
+    EndRawTag = /\A(.*)#{TagStart}\s*endraw.*?#{TagEnd}\z/om
 
     def initialize(tag_name, markup, parse_context)
       super
@@ -14,7 +14,7 @@ module Liquid
     def parse(tokens)
       @body = +''
       while (token = tokens.shift)
-        if token =~ FullTokenPossiblyInvalid && block_delimiter == Regexp.last_match(2)
+        if token =~ EndRawTag
           @body << Regexp.last_match(1) if Regexp.last_match(1) != ""
           return
         end

test/integration/block_test.rb

@@ -55,24 +55,4 @@ class BlockTest < Minitest::Test
       assert_equal buf.object_id, output.object_id
     end
   end
-
-  def test_instrument_for_bug_1346
-    calls = []
-    Liquid::Usage.stub(:increment, ->(name) { calls << name }) do
-      Liquid::Template.parse("{% for i in (1..2) %}{{ i }}{% endfor {% foo %}")
-    end
-    assert_equal(["end_tag_params"], calls)
-
-    calls = []
-    Liquid::Usage.stub(:increment, ->(name) { calls << name }) do
-      Liquid::Template.parse("{% for i in (1..2) %}{{ i }}{% endfor test %}")
-    end
-    assert_equal(["end_tag_params"], calls)
-
-    calls = []
-    Liquid::Usage.stub(:increment, ->(name) { calls << name }) do
-      Liquid::Template.parse("{% for i in (1..2) %}{{ i }}{% endfor %}")
-    end
-    assert_equal([], calls)
-  end
 end

test/integration/expression_test.rb

@@ -29,7 +29,6 @@ class ExpressionTest < Minitest::Test
   def test_range
     assert_equal(1..2, parse_and_eval("(1..2)"))
     assert_equal(3..4, parse_and_eval(" ( 3 .. 4 ) "))
-    assert_equal(1..2, parse_and_eval("(1.1..2.2)"))
   end
 
   private

test/integration/tags/for_tag_test.rb

@@ -50,7 +50,6 @@ HERE
 
   def test_for_with_variable_range
     assert_template_result(' 1  2  3 ', '{%for item in (1..foobar) %} {{item}} {%endfor%}', "foobar" => 3)
-    assert_template_result(' 1  2  3 ', '{%for item in (x..y) %} {{item}} {%endfor%}', "x" => 1.1, "y" => 3.3)
   end
 
   def test_for_with_hash_value_range
@@ -438,30 +437,4 @@ HERE
 
     assert(context.registers[:for_stack].empty?)
   end
-
-  def test_instrument_for_offset_continue
-    assert_usage_increment('for_offset_continue') do
-      Template.parse('{% for item in items offset:continue %}{{item}}{% endfor %}')
-    end
-
-    assert_usage_increment('for_offset_continue', times: 0) do
-      Template.parse('{% for item in items offset:2 %}{{item}}{% endfor %}')
-    end
-  end
-
-  def test_instrument_forloop_drop_name
-    assigns = { 'items' => [1, 2, 3, 4, 5] }
-
-    assert_usage_increment('forloop_drop_name', times: 5) do
-      Template.parse('{% for item in items %}{{forloop.name}}{% endfor %}').render!(assigns)
-    end
-
-    assert_usage_increment('forloop_drop_name', times: 0) do
-      Template.parse('{% for item in items %}{{forloop.index}}{% endfor %}').render!(assigns)
-    end
-
-    assert_usage_increment('forloop_drop_name', times: 0) do
-      Template.parse('{% for item in items %}{{item}}{% endfor %}').render!(assigns)
-    end
-  end
 end

test/integration/tags/raw_tag_test.rb

@@ -12,6 +12,8 @@ class RawTagTest < Minitest::Test
 
   def test_output_in_raw
     assert_template_result('{{ test }}', '{% raw %}{{ test }}{% endraw %}')
+    assert_template_result('test', '{% raw %}test{% endraw{% f %}')
+    assert_template_result('test', '{% raw %}test{% endraw{% |f %}')
   end
 
   def test_open_tag_in_raw

test/integration/trim_mode_test.rb

@@ -556,8 +556,4 @@ class TrimModeTest < Minitest::Test
     template = Liquid::Template.parse("B\n {%- if true %}{% endif %}", bug_compatible_whitespace_trimming: true)
     assert_equal("B", template.render)
   end
-
-  def test_trim_blank
-    assert_template_result('foobar', 'foo {{-}} bar')
-  end
 end # TrimModeTest