#356 Code with windows line endings after formatting still has windows endings #445
Conversation
| } | ||
| } | ||
| } catch { | ||
| // TODO(olafur) add more fine grained errors. | ||
| case NonFatal(e) => FormatResult.Failure(e) | ||
| } | ||
| } | ||
|
|
||
| private[this] def containsWindowsLineEndings(code: String): Boolean = | ||
| code.contains("\r\n") |
| import org.scalatest.FunSuite | ||
|
|
||
| class LineEndingsTest extends FunSuite with DiffAssertions { | ||
| val javadocStyle = ScalafmtStyle.default.copy(scalaDocs = false) |
|
Corrected, squashed, pushed :) |
|
One last thought, should we have a flag to disable this new behavior? |
|
Whoops, I was fiddling with automatic publishing from travis (only possible from master branch) and just remembered that I disabled the tests suite to get faster experiments. Could you rebase on master and re-sync? |
Yes please, so that |
Current coverage is 87.23% (diff: 92.00%)@@ master #445 diff @@
==========================================
Files 35 35
Lines 2228 2249 +21
Methods 2092 2116 +24
Messages 0 0
Branches 136 133 -3
==========================================
+ Hits 1942 1962 +20
- Misses 286 287 +1
Partials 0 0
|
|
@sjrd how about a flag like This option could be a sealed abstract class |
|
@olafurpg as |
|
@mmatloka Hmmm. Excellent question. I think preserve should be the behavior implemented in this PR. The current master branch behavior is buggy. |
|
@mmatloka For the readme, it should be |
| @@ -293,3 +293,14 @@ | |||
| function( | |||
| argument1, | |||
| argument2) | |||
| @sect{--lineEndings} | |||
| Default: @b(preserve) | |||
There was a problem hiding this comment.
@b{preserve} will do the trick ;)
|
I have added the flag. Included in tests and docs, however I was not able to generate readme from scalatex locally, I don't know why yet ( |
|
LGTM. Thanks a lot for this contribution 😄 I expect to release very soon, the wifi is pretty bad at home so I may wait until tomorrow when I go to work. |
|
Thanks :) |
|
I am afraid the 0.3.2 release is taking longer than I expected. Is that OK? I have some exciting features in the pipeline that are almost complete and I want to bundle everything in a 0.4. |
Related to: https://github.com/olafurpg/scalafmt/issues/365#issuecomment-243346157