[Rouge 2] use Rouge::Formatters::HTMLLegacy and fix tests
#6150
Conversation
jekyll.gemspec
Outdated
| @@ -38,6 +38,6 @@ Gem::Specification.new do |s| | |||
| s.add_runtime_dependency("liquid", "~> 4.0") | |||
| s.add_runtime_dependency("mercenary", "~> 0.3.3") | |||
| s.add_runtime_dependency("pathutil", "~> 0.9") | |||
| s.add_runtime_dependency("rouge", "~> #{ENV["ROUGE_VERSION"] || "1.7"}") | |||
| s.add_runtime_dependency("rouge", "~> #{ENV["ROUGE_VERSION"] || "2.1.0"}") | |||
There was a problem hiding this comment.
Does this work with 2.0 & 2.2, or is only 2.1.x compatible? Usually we'd just use 2 digits here, e.g. 2.0.
There was a problem hiding this comment.
👍 It should also work with any 2.x version, i'll update!
| if old_api? | ||
| ::Rouge::Formatters::HTML.new(*args) | ||
| else | ||
| ::Rouge::Formatters::HTMLLegacy.new(*args) |
There was a problem hiding this comment.
What does the new API look like? is this just a wrapper around the new functionality with the old API?
There was a problem hiding this comment.
Yes, exactly. It produces (almost) the same output as rouge 1.11 while receiving the same arguments.
There was a problem hiding this comment.
Here are all default formatters listed. IMHO line numbers (which we rely on in a couple of tests) would also be present in Rouge::Formatters::HTMLTable and Rouge::Formatters::HTMLLinewise but HTMLLegacy should be the easiest update.
There was a problem hiding this comment.
Does HTMLLegacy not have those features?
There was a problem hiding this comment.
Oh, sorry, this was unclear: HTMLLegacy also has line numbers and all features we currently use.
The 2.x version of the standard HTML formatter doesn't have line numbers.
| @@ -38,6 +38,6 @@ Gem::Specification.new do |s| | |||
| s.add_runtime_dependency("liquid", "~> 4.0") | |||
| s.add_runtime_dependency("mercenary", "~> 0.3.3") | |||
| s.add_runtime_dependency("pathutil", "~> 0.9") | |||
| s.add_runtime_dependency("rouge", "~> #{ENV["ROUGE_VERSION"] || "1.7"}") | |||
| s.add_runtime_dependency("rouge", "~> #{ENV["ROUGE_VERSION"] || "2.1"}") | |||
There was a problem hiding this comment.
This is a bit wonky IMO. You could probably do something like:
s.add_runtime_dependency "rouge", ">= 1.7", "< 2.2"And have a much easier time.
|
I'll fix up the dependency in the parent PR. Thank you!!! |
Hey,
i changed
Formatters::HTMLforFormatters::HTMLLegacybased on @jneen 's suggestion (#5919 (comment)) and becauseFormatters::HTML(the rouge 2 version) doesn't print line numbers (unless i missed something).Note: This targets #5919 instead of
master. Will close #5230 in favor of this.