Skip to content

Delegate ERB args correctly #760

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
merged 1 commit into from
Apr 6, 2020
Merged

Delegate ERB args correctly #760

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
4 changes: 2 additions & 2 deletions lib/rdoc/erbio.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ class RDoc::ERBIO < ERB
##
# Defaults +eoutvar+ to 'io', otherwise is identical to ERB's initialize

def initialize str, safe_level = nil, trim_mode = nil, eoutvar = 'io'
def initialize str, safe_level = nil, legacy_trim_mode = nil, legacy_eoutvar = 'io', trim_mode: nil, eoutvar: 'io'
if RUBY_VERSION >= '2.6'
super(str, trim_mode: trim_mode, eoutvar: eoutvar)
else
super
super(str, safe_level, legacy_trim_mode, legacy_eoutvar)
end
end

Expand Down
4 changes: 2 additions & 2 deletions lib/rdoc/generator/darkfish.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,9 +779,9 @@ def template_for file, page = true, klass = ERB
end

if RUBY_VERSION >= '2.6'
template = klass.new template, trim_mode: '<>', eoutvar: erbout
template = klass.new template, trim_mode: '-', eoutvar: erbout
else
template = klass.new template, nil, '<>', erbout
template = klass.new template, nil, '-', erbout
end
@template_cache[file] = template
template
Expand Down