Skip to content

Ensure we always use Kernel.caller_locations #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
schneems merged 1 commit into from
May 10, 2021
Merged

Ensure we always use Kernel.caller_locations #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## HEAD (unreleased)

- Fix sinatra support for `require_relative` (https://github.com/zombocom/dead_end/pull/63)

## 1.1.6

- Consider if syntax error caused an unexpected variable instead of end (https://github.com/zombocom/dead_end/pull/58)
Expand Down
2 changes: 1 addition & 1 deletion lib/dead_end/auto.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def require_relative(file)
if Pathname.new(file).absolute?
dead_end_original_require file
else
dead_end_original_require File.expand_path("../#{file}", caller_locations(1, 1)[0].absolute_path)
dead_end_original_require File.expand_path("../#{file}", Kernel.caller_locations(1, 1)[0].absolute_path)
end
rescue SyntaxError => e
DeadEnd.handle_error(e)
Expand Down