Fix post-trim for the raw tag

The added test did not pass before this commit.

.travis.yml

@@ -15,7 +15,6 @@ matrix:
       name: Profiling Memory Usage
   allow_failures:
     - rvm: ruby-head
-    - rvm: 2.7
 
 branches:
   only:

lib/liquid.rb

@@ -80,7 +80,6 @@ require 'liquid/partial_cache'
 require 'liquid/usage'
 require 'liquid/register'
 require 'liquid/static_registers'
-require 'liquid/template_factory'
 
 # Load all the tags of the standard library
 #

lib/liquid/partial_cache.rb

@@ -12,10 +12,7 @@ module Liquid
 
       parse_context.partial = true
 
-      template_factory = (context.registers[:template_factory] ||= Liquid::TemplateFactory.new)
-      template = template_factory.for(template_name)
-
-      partial = template.parse(source, parse_context)
+      partial = Liquid::Template.parse(source, parse_context)
       cached_partials[template_name] = partial
     ensure
       parse_context.partial = false

lib/liquid/tags/raw.rb

@@ -16,7 +16,10 @@ module Liquid
       while (token = tokens.shift)
         if token =~ FullTokenPossiblyInvalid
           @body << Regexp.last_match(1) if Regexp.last_match(1) != ""
-          return if block_delimiter == Regexp.last_match(2)
+          if block_delimiter == Regexp.last_match(2)
+            @parse_context.trim_whitespace = (token[-3] == WhitespaceControl)
+            return
+          end
         end
         @body << token unless token.empty?
       end

lib/liquid/template_factory.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module Liquid
-  class TemplateFactory
-    def for(_template_name)
-      Liquid::Template.new
-    end
-  end
-end

test/integration/tags/raw_tag_test.rb

@@ -14,6 +14,10 @@ class RawTagTest < Minitest::Test
     assert_template_result('{{ test }}', '{% raw %}{{ test }}{% endraw %}')
   end
 
+  def test_post_trim
+    assert_template_result('hi', "{% raw %}hi{% endraw -%}\n")
+  end
+
   def test_open_tag_in_raw
     assert_template_result(' Foobar {% invalid ', '{% raw %} Foobar {% invalid {% endraw %}')
     assert_template_result(' Foobar invalid %} ', '{% raw %} Foobar invalid %} {% endraw %}')

test/test_helper.rb

@@ -136,16 +136,3 @@ class StubFileSystem
     @values.fetch(template_path)
   end
 end
-
-class StubTemplateFactory
-  attr_reader :count
-
-  def initialize
-    @count = 0
-  end
-
-  def for(_template_name)
-    @count += 1
-    Liquid::Template.new
-  end
-end

test/unit/partial_cache_unit_test.rb

@@ -90,39 +90,4 @@ class PartialCacheUnitTest < Minitest::Test
     # but measuring file reads is an OK proxy for this.
     assert_equal(1, file_system.file_read_count)
   end
-
-  def test_uses_default_template_factory_when_no_template_factory_found_in_register
-    context = Liquid::Context.build(
-      registers: {
-        file_system: StubFileSystem.new('my_partial' => 'my partial body'),
-      }
-    )
-
-    partial = Liquid::PartialCache.load(
-      'my_partial',
-      context: context,
-      parse_context: Liquid::ParseContext.new
-    )
-
-    assert_equal('my partial body', partial.render)
-  end
-
-  def test_uses_template_factory_register_if_present
-    template_factory = StubTemplateFactory.new
-    context = Liquid::Context.build(
-      registers: {
-        file_system: StubFileSystem.new('my_partial' => 'my partial body'),
-        template_factory: template_factory,
-      }
-    )
-
-    partial = Liquid::PartialCache.load(
-      'my_partial',
-      context: context,
-      parse_context: Liquid::ParseContext.new
-    )
-
-    assert_equal('my partial body', partial.render)
-    assert_equal(1, template_factory.count)
-  end
 end

test/unit/template_factory_unit_test.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-class TemplateFactoryUnitTest < Minitest::Test
-  include Liquid
-
-  def test_for_returns_liquid_template_instance
-    template = TemplateFactory.new.for("anything")
-    assert_instance_of(Liquid::Template, template)
-  end
-end