Only use MethodLiteral in condition expressions

since I would like to continue supporting these tests in liquid-c
in the foreseeable future.

lib/liquid/block_body.rb

@@ -153,11 +153,7 @@ module Liquid
       if token[2] == WhitespaceControl
         previous_token = @nodelist.last
         if previous_token.is_a?(String)
-          first_byte = previous_token.getbyte(0)
           previous_token.rstrip!
-          if previous_token.empty? && parse_context[:bug_compatible_whitespace_trimming] && first_byte
-            previous_token << first_byte
-          end
         end
       end
       parse_context.trim_whitespace = (token[-3] == WhitespaceControl)

lib/liquid/condition.rb

@@ -34,6 +34,10 @@ module Liquid
         @method_name = method_name
         @to_s = to_s
       end
+
+      def to_liquid
+        to_s
+      end
     end
 
     @@method_literals = {

lib/liquid/context.rb

@@ -18,16 +18,15 @@ module Liquid
     attr_accessor :exception_renderer, :template_name, :partial, :global_filter, :strict_variables, :strict_filters
 
     # rubocop:disable Metrics/ParameterLists
-    def self.build(environments: {}, outer_scope: {}, registers: {}, rethrow_errors: false, resource_limits: nil, static_environments: [])
+    def self.build(environments: {}, outer_scope: {}, registers: {}, rethrow_errors: false, resource_limits: nil, static_environments: {})
       new(environments, outer_scope, registers, rethrow_errors, resource_limits, static_environments)
     end
 
-    def initialize(environments = {}, outer_scope = {}, registers = {}, rethrow_errors = false, resource_limits = nil, static_environments = [])
+    def initialize(environments = {}, outer_scope = {}, registers = {}, rethrow_errors = false, resource_limits = nil, static_environments = {})
       @environments = [environments]
       @environments.flatten!
 
-      static_environments = [static_environments] if static_environments.is_a?(Hash)
-      @static_environments = static_environments.map(&:freeze).freeze
+      @static_environments = [static_environments].flat_map(&:freeze).freeze
       @scopes              = [(outer_scope || {})]
       @registers           = registers
       @errors              = []

test/integration/context_test

@@ -492,17 +492,6 @@ class ContextTest < Minitest::Test
     assert_equal('static', context['unshadowed'])
   end
 
-  def test_static_environments_are_frozen
-    context = Context.build(
-      static_environments: [{
-        'lazy' => -> { 1 }
-      }],
-    )
-    assert_raises(FrozenError) do
-      context['lazy']
-    end
-  end
-
   def test_apply_global_filter_when_no_global_filter_exist
     context = Context.new
     assert_equal('hi', context.apply_global_filter('hi'))

test/integration/trim_mode_test.rb

@@ -528,32 +528,4 @@ class TrimModeTest < Minitest::Test
     END_EXPECTED
     assert_template_result(expected, text)
   end
-
-  def test_pre_trim_blank_preceding_text
-    template = Liquid::Template.parse("\n{%- raw %}{% endraw %}")
-    assert_equal("", template.render)
-
-    template = Liquid::Template.parse("\n{%- if true %}{% endif %}")
-    assert_equal("", template.render)
-
-    template = Liquid::Template.parse("{{ 'B' }} \n{%- if true %}C{% endif %}")
-    assert_equal("BC", template.render)
-  end
-
-  def test_bug_compatible_pre_trim
-    template = Liquid::Template.parse("\n {%- raw %}{% endraw %}", bug_compatible_whitespace_trimming: true)
-    assert_equal("\n", template.render)
-
-    template = Liquid::Template.parse("\n {%- if true %}{% endif %}", bug_compatible_whitespace_trimming: true)
-    assert_equal("\n", template.render)
-
-    template = Liquid::Template.parse("{{ 'B' }} \n{%- if true %}C{% endif %}", bug_compatible_whitespace_trimming: true)
-    assert_equal("B C", template.render)
-
-    template = Liquid::Template.parse("B\n {%- raw %}{% endraw %}", bug_compatible_whitespace_trimming: true)
-    assert_equal("B", template.render)
-
-    template = Liquid::Template.parse("B\n {%- if true %}{% endif %}", bug_compatible_whitespace_trimming: true)
-    assert_equal("B", template.render)
-  end
 end # TrimModeTest