Skip to content

Commit

Permalink
[ruby/syntax_suggest] Handle new eval source location
Browse files Browse the repository at this point in the history
See https://bugs.ruby-lang.org/issues/19755

In Ruby 3.3, using `eval` without providing a source location
will now default to `"(eval at #{__FILE__}:#{__LINE__})"`.

ruby/syntax_suggest@8e5076472e
  • Loading branch information
byroot authored and matzbot committed Jul 20, 2023
1 parent b41fc9b commit 460c27d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/syntax_suggest/pathname_from_message.rb
Expand Up @@ -13,7 +13,7 @@ module SyntaxSuggest
# # => "/tmp/scratch.rb"
#
class PathnameFromMessage
EVAL_RE = /^\(eval\):\d+/
EVAL_RE = /^\(eval.*\):\d+/
STREAMING_RE = /^-:\d+/
attr_reader :name

Expand Down
2 changes: 1 addition & 1 deletion spec/syntax_suggest/integration/ruby_command_line_spec.rb
Expand Up @@ -167,7 +167,7 @@ class Dog
out = `#{ruby} -I#{lib_dir} -rsyntax_suggest #{script} 2>&1`

expect($?.success?).to be_falsey
expect(out).to include("(eval):1")
expect(out).to match(/\(eval.*\):1/)

expect(out).to_not include("SyntaxSuggest")
expect(out).to_not include("Could not find filename")
Expand Down
9 changes: 9 additions & 0 deletions spec/syntax_suggest/unit/pathname_from_message_spec.rb
Expand Up @@ -43,6 +43,15 @@ module SyntaxSuggest
expect(file).to be_falsey
end

it "does not output error message on syntax error inside of an (eval at __FILE__:__LINE__)" do
message = "(eval at #{__FILE__}:#{__LINE__}):1: invalid multibyte char (UTF-8) (SyntaxError)\n"
io = StringIO.new
file = PathnameFromMessage.new(message, io: io).call.name

expect(io.string).to eq("")
expect(file).to be_falsey
end

it "does not output error message on syntax error inside of streamed code" do
# An example of streamed code is: $ echo "def foo" | ruby
message = "-:1: syntax error, unexpected end-of-input\n"
Expand Down

0 comments on commit 460c27d

Please sign in to comment.