fix another whitespace bug

Author: joelhawksley

lib/herb/engine/compiler.rb

@@ -512,10 +512,18 @@ def at_line_start?
           @tokens.last[0] != :text ||
           @tokens.last[1].empty? ||
           @tokens.last[1].end_with?("\n") ||
-          @tokens.last[1] =~ /\A[ \t]+\z/ ||
+          (@tokens.last[1] =~ /\A[ \t]+\z/ && preceding_token_ends_with_newline?) ||
           @tokens.last[1] =~ /\n[ \t]+\z/
       end
 
+      def preceding_token_ends_with_newline?
+        preceding = @tokens.length >= 2 ? @tokens[-2] : nil
+        return true unless preceding
+        return true unless preceding[0] == :text
+
+        preceding[1].end_with?("\n")
+      end
+
       def extract_lspace
         return "" unless @tokens.last && @tokens.last[0] == :text
 

test/engine/whitespace_trimming_test.rb

@@ -169,5 +169,12 @@ class WhitespaceTrimmingTest < Minitest::Spec
       assert_compiled_snapshot(template)
       assert_evaluated_snapshot(template, enforce_erubi_equality: true)
     end
+
+    test "inline space between close tag and ERB control tag is preserved" do
+      template = "<strong>Foo:</strong> <% if true %>Bar<% end %>"
+
+      assert_compiled_snapshot(template)
+      assert_evaluated_snapshot(template, enforce_erubi_equality: true)
+    end
   end
 end