diff options
| author | aycabta <aycabta@gmail.com> | 2020-04-01 05:18:54 +0900 |
|---|---|---|
| committer | aycabta <aycabta@gmail.com> | 2020-05-24 23:47:24 +0900 |
| commit | 32e0ff26e0ea5887a79cbf1ffd81513a4f392d76 (patch) | |
| tree | b1699b917a4dcb9e7dbd0c053171b246ed482d34 /lib/rdoc | |
| parent | 7e7981c84f8cd3225b5e915cba2281869a08b784 (diff) | |
[ruby/rdoc] Delegate ERB args correctly
https://github.com/ruby/rdoc/commit/82ff37a822
Diffstat (limited to 'lib/rdoc')
| -rw-r--r-- | lib/rdoc/erbio.rb | 4 | ||||
| -rw-r--r-- | lib/rdoc/generator/darkfish.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/rdoc/erbio.rb b/lib/rdoc/erbio.rb index 820a25ae01..0d5f96e133 100644 --- a/lib/rdoc/erbio.rb +++ b/lib/rdoc/erbio.rb @@ -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 diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb index c5d47ef355..5049aa452e 100644 --- a/lib/rdoc/generator/darkfish.rb +++ b/lib/rdoc/generator/darkfish.rb @@ -779,9 +779,9 @@ class RDoc::Generator::Darkfish 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 |