code styling

Shopify · Nov 15, 2024 · 1c8460c · 1c8460c
1 parent fc432e2
commit 1c8460c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/lib/liquid/lexer.rb b/lib/liquid/lexer.rb
@@ -164,7 +164,7 @@ def string_scanner
     end
 
     def initialize(input)
-      @ss = Lexer2.string_scanner
+      @ss = self.class.string_scanner
       @ss.string = input
     end
 

diff --git a/lib/liquid/tokenizer.rb b/lib/liquid/tokenizer.rb
@@ -91,7 +91,7 @@ def tokenize
       if @for_liquid_tag
         @tokens = @source.split("\n")
       else
-        @ss = Tokenizer2.string_scanner
+        @ss = self.class.string_scanner
         @ss.string = @source
         @tokens << shift_normal until @ss.eos?
       end

diff --git a/test/integration/tags/for_tag_test.rb b/test/integration/tags/for_tag_test.rb
@@ -99,6 +99,15 @@ def test_for_else
     assert_template_result('+++', '{%for item in array%}+{%else%}-{%endfor%}', { 'array' => [1, 2, 3] })
     assert_template_result('-',   '{%for item in array%}+{%else%}-{%endfor%}', { 'array' => [] })
     assert_template_result('-',   '{%for item in array%}+{%else%}-{%endfor%}', { 'array' => nil })
+
+    template = <<~LIQUID
+      {%- for item in array -%}
+      {%- else -%}
+        forloop.index: {{ forloop.index }}
+      {%- endfor -%}
+    LIQUID
+
+    assert_template_result('forloop.index: ', template, { 'array' => nil })
   end
 
   def test_limiting