Roll-back snippet indentation #245
Merged
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
ktoso
reviewed
Sep 11, 2018
| @@ -28,16 +26,40 @@ object Snippet { | |||
| class SnippetException(message: String) extends RuntimeException(message) | |||
|
|
|||
| def apply(file: File, labels: Seq[String]): (String, String) = { | |||
| (extract(file, labels), language(file)) | |||
| val lines = Source.fromFile(file)("UTF-8").getLines.toSeq | |||
There was a problem hiding this comment.
this leaks file descriptor doesnt it?
gotta close the source
There was a problem hiding this comment.
Good point, the lines used to be read multiple times like this...
There was a problem hiding this comment.
There's a few spots below as well, please skim for the leak :)
ktoso
reviewed
Sep 11, 2018
| (extract(file, lines, labels), language(file)) | ||
| } | ||
|
|
||
| def extract(file: File, lines: Seq[String], labels: Seq[String]): String = { |
There was a problem hiding this comment.
I guess Snippet.extract is OK.
ktoso
reviewed
Sep 11, 2018
| } | ||
|
|
||
| def extractLabelRange(file: File, label: String): Option[(Int, Int)] = { | ||
| val lineNumbers = extractState(file, label).lines.map(_._1) | ||
| val lines = Source.fromFile(file)("UTF-8").getLines.toSeq |
There was a problem hiding this comment.
here too, watch out to close the source
ktoso
reviewed
Sep 11, 2018
| @@ -89,7 +89,7 @@ class SnipDirectiveSpec extends MarkdownBaseSpec { | |||
| |<pre class="prettyprint"> | |||
| |<code class="language-scala"> | |||
| |case object Dent | |||
| |case object DoubleDent</code> | |||
| | case object DoubleDent</code> | |||
There was a problem hiding this comment.
That's what Akka asked for...
The example is for how Alpakka wanted it to be.
ktoso
reviewed
Sep 11, 2018
| val in = inString.split("\n").toList | ||
| Snippet.extract(new File(""), in, Seq(label)) | ||
| } | ||
| } |
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 rolls back the snippet indentation logic introduced by #201. But has special handling for
importlines, so that they become aligned with the left-most code in other snippets with the same label.Relates to:
akka/akka#25564
#242