Only complain about kramdown.coderay if it is actually in the config
#5380
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pathawks
requested changes
Sep 19, 2016
| @@ -104,7 +104,7 @@ def strip_coderay_prefix(hash) | |||
|
|
|||
| private | |||
| def modernize_coderay_config | |||
| if highlighter == "coderay" | |||
| if !@config["coderay"].empty? | |||
There was a problem hiding this comment.
I can't speak to the wider implications of this change, but as far as style goes, could we use unless instead of if !?
I think Rubocop should be complaining about this.
Edit: Sure enough.
Don't complain about the deprecated `kramdown.coderay` key when `highlighter == "coderay"`, since that could have been set with the legitimate `syntax_highlighter: coderay` setting. Instead, complain only if the `kramdown.coderay` configuration setting is actually present.
|
Rubocop errors are fixed on |
|
@jekyllbot: merge +buf |
jekyllbot
added a commit
that referenced
this pull request
Sep 20, 2016
parkr
added a commit
that referenced
this pull request
Sep 21, 2016
|
Thanks @parkr ! ❤️ |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
After upgrading to jekyll 3, I wanted to continue using coderay as my highlighter. So I updated my configuration to:
And I was surprised when jekyll complained:
It seems that jekyll is raising this notice whenever
highlighter == "coderay", even when thekramdown.coderayconfiguration setting is nonexistent.Switching this to check for a non-empty
kramdown.coderayhash keeps this warning when the user haskramdown.coderaysettings, but suppresses this warning when the configuration has switched to the new stylekramdown.syntax_highlighter_opts.