Fix reading of jar resource files for dottydoc #2546
Merged
Conversation
This file contains hidden or 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
liufengyun
approved these changes
May 26, 2017
DarkDimius
reviewed
May 26, 2017
| @@ -9,8 +9,8 @@ trait ResourceFinder { | |||
| final case class ResourceNotFoundException(message: String) extends Exception(message) | |||
|
|
|||
| protected def getResource(r: String): String = | |||
| Option(getClass.getResourceAsStream(r)).map(scala.io.Source.fromInputStream) | |||
| Option(getClass.getResourceAsStream(r)) | |||
| .map(scala.io.Source.fromInputStream(_)(scala.io.Codec.UTF8)) | |||
There was a problem hiding this comment.
don't hardcode it. Use Properties.sourceEncoding that all the other compiler parts use.
There was a problem hiding this comment.
No, it needs to be hardcoded here. This is just reading of assets from the jar, it has nothing to do with compiling sources. This is guaranteed to always be UTF8.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This was the bug that didn't work with the released version. Since the codec was not specified, it assumed ISO-8859-1 :(
Now it is correctly UTF8 (master race)