Merge pull request rails#54410 from Edouard-chin/ec-syntax-error

No dump of the entire template when a syntax error is encountered:

Author: byroot

actionview/lib/action_view/template/error.rb

@@ -260,9 +260,13 @@ def initialize(template, offending_code_string)
     end
 
     def message
-      <<~MESSAGE
-        Encountered a syntax error while rendering template: check #{@offending_code_string}
-      MESSAGE
+      if template.is_a?(Template::Inline)
+        <<~MESSAGE
+          Encountered a syntax error while rendering template: check #{@offending_code_string}
+        MESSAGE
+      else
+        "Encountered a syntax error while rendering template located at: #{template.short_identifier}"
+      end
     end
 
     def annotated_source_code

railties/test/application/rendering_test.rb

@@ -86,5 +86,69 @@ def self.call(_, source)
       assert_equal 200, last_response.status
       assert_equal({ format: :awesome, handler: RubbyHandler }.inspect, last_response.body)
     end
+
+    test "template content is dumped if rendered inline and a syntax error is encountered" do
+      app_file "config/routes.rb", <<-RUBY
+        Rails.application.routes.draw do
+          root to: 'pages#show'
+        end
+      RUBY
+
+      app_file "app/controllers/pages_controller.rb", <<-RUBY
+        class PagesController < ApplicationController
+          layout false
+
+          def show
+            render(inline: "<% [ %>")
+          end
+        end
+      RUBY
+
+      app("development")
+
+      get("/", {}, { "HTTPS" => "on" })
+
+      assert_equal 500, last_response.status
+      document = Nokogiri::HTML5.parse(last_response.body)
+      nodes = document.css("div.exception-message>div.message")
+
+      assert_not_empty(nodes)
+      assert_equal("Encountered a syntax error while rendering template: check <% [ %>\n", nodes.first.text)
+    end
+
+    test "template content is not dumped when rendered from file and a syntax error is encountered" do
+      app_file "config/routes.rb", <<-RUBY
+        Rails.application.routes.draw do
+          root to: 'pages#show'
+        end
+      RUBY
+
+      app_file "app/controllers/pages_controller.rb", <<-RUBY
+        class PagesController < ApplicationController
+          layout false
+
+          def show
+          end
+        end
+      RUBY
+
+      app_file "app/views/pages/show.html.erb", <<-RUBY
+        <% [ %>
+      RUBY
+
+      app("development")
+
+      get("/", {}, { "HTTPS" => "on" })
+
+      assert_equal 500, last_response.status
+      document = Nokogiri::HTML5.parse(last_response.body)
+      nodes = document.css("div.exception-message>div.message")
+
+      assert_not_empty(nodes)
+      assert_equal(
+        "Encountered a syntax error while rendering template located at: app/views/pages/show.html.erb",
+        nodes.first.text,
+      )
+    end
   end
 end