Proper UTF-8 encoding and line endings on Windows #5457
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
|
Can this PR only include the last commit? I am happy to review it separately |
allanrenucci
suggested changes
Nov 21, 2018
| @@ -24,8 +26,9 @@ class DecompilationPrinter extends Phase { | |||
| var os: OutputStream = null | |||
| var ps: PrintStream = null | |||
| try { | |||
| implicit val codec = Codec.UTF8 | |||
| os = File(outputDir.fileNamed("decompiled.scala").path).outputStream(append = true) | |||
There was a problem hiding this comment.
I would not introduce an implicit in scope but pass the implicit explicitly:
Suggested change
| os = File(outputDir.fileNamed("decompiled.scala").path).outputStream(append = true) | |
| os = File(outputDir.fileNamed("decompiled.scala").path)(Codec.UTF8).outputStream(append = true) |
| os = File(outputDir.fileNamed("decompiled.scala").path).outputStream(append = true) | ||
| ps = new PrintStream(os) | ||
| ps = new PrintStream(os, /*autoFlush*/false, "UTF-8") |
There was a problem hiding this comment.
I would mimic the named argument syntax:
Suggested change
| ps = new PrintStream(os, /*autoFlush*/false, "UTF-8") | |
| ps = new PrintStream(os, /* autoFlush = */ false, "UTF-8") |
| @@ -15,6 +15,9 @@ import scala.annotation.switch | |||
| import scala.collection.mutable | |||
|
|
|||
| trait MessageRendering { | |||
|
|
|||
| private final val EOL: String = sys.props("line.separator") | |||
There was a problem hiding this comment.
Remove and import:
import java.lang.System.{lineSeparator => EOL}| @@ -5,6 +5,8 @@ import org.junit.{Ignore, Test} | |||
|
|
|||
| class ReplCompilerTests extends ReplTest { | |||
|
|
|||
| private final val EOL: String = sys.props("line.separator") | |||
There was a problem hiding this comment.
Remove and import:
import java.lang.System.{lineSeparator => EOL}| @@ -14,6 +14,8 @@ import dotc.reporting.MessageRendering | |||
| /** Runs all tests contained in `compiler/test-resources/repl/` */ | |||
| class ScriptedTests extends ReplTest with MessageRendering { | |||
|
|
|||
| private final val EOL: String = sys.props("line.separator") | |||
There was a problem hiding this comment.
Remove and import:
import java.lang.System.{lineSeparator => EOL}| @@ -187,6 +187,8 @@ trait ParallelTesting extends RunnerOrchestration { self => | |||
| protected final val realStdout = System.out | |||
| protected final val realStderr = System.err | |||
|
|
|||
| protected final val EOL: String = sys.props("line.separator") | |||
There was a problem hiding this comment.
Remove and import:
import java.lang.System.{lineSeparator => EOL}
allanrenucci
approved these changes
Nov 21, 2018
|
Thanks @michelou |
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 PR is correlated with PR #5159; it includes a few changes (line endings) also present in that request.
I have tested the submitted changes on a Windows machine running the batch script
project\scripts\build.bat(part of PR #5444) which particularly reproduces the two stepscloneandcompileof Dotty CI.The changes address two issues on Windows:
Examples:
Source.fromFile(f)→Source.fromFile(f, "UTF-8")new PrintStream(os)→new PrintStream(os, autoFlush, "UTF-8")Example:
"\n"→sys.props("line.separator")