From 11b1ebe606a82bcdcb4ff5568f0302c5470d0048 Mon Sep 17 00:00:00 2001
From: Christian Boos <cboos@bct-technology.com>
Date: Wed, 29 Dec 2021 22:10:21 +0000
Subject: [PATCH] [ruby/error_highlight] Fix the spurious TypeError.

When we have no backtrace locations, we can't have the highlight,
so just return the message.

https://github.com/ruby/error_highlight/commit/9f5c639494
---
 lib/error_highlight/core_ext.rb              | 1 +
 test/error_highlight/test_error_highlight.rb | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/error_highlight/core_ext.rb b/lib/error_highlight/core_ext.rb
index d3a4dbacd6..78cda8ace2 100644
--- a/lib/error_highlight/core_ext.rb
+++ b/lib/error_highlight/core_ext.rb
@@ -15,6 +15,7 @@ module ErrorHighlight
       return msg unless locs
 
       loc = locs.first
+      return msg unless loc
       begin
         node = RubyVM::AbstractSyntaxTree.of(loc, keep_script_lines: true)
         opts = {}
diff --git a/test/error_highlight/test_error_highlight.rb b/test/error_highlight/test_error_highlight.rb
index 222da0fc79..d31e394e78 100644
--- a/test/error_highlight/test_error_highlight.rb
+++ b/test/error_highlight/test_error_highlight.rb
@@ -1198,9 +1198,6 @@ undefined method `time' for 1:Integer
   def test_simulate_funcallv_from_embedded_ruby
     assert_error_message(NoMethodError, <<~END) do
 undefined method `foo' for nil:NilClass
-
-      nil.foo + 1
-         ^^^^
     END
 
       nil.foo + 1