Skip to content

Utility.trim collapse whitespace for adjacent text nodes #73 #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 24, 2018
Merged

Utility.trim collapse whitespace for adjacent text nodes #73 #113

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b4e969
Unit tests for Issue #73
EdgeCaseBerg Oct 6, 2016
1e3b288
Unit tests for #73 passing
EdgeCaseBerg Oct 6, 2016
361d02e
Improve combineAdjacentTextNodes logic
EdgeCaseBerg May 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions shared/src/main/scala/scala/xml/Utility.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,9 @@ object Utility extends AnyRef with parsing.TokenTests {
}

private def combineAdjacentTextNodes(children: Node*): Seq[Node] = {
children.foldLeft(Seq.empty[Node]) { (acc, n) =>
(acc.lastOption, n) match {
case (Some(Text(l)), Text(r)) => {
acc.dropRight(1) :+ Text(l + r)
}
case _ => acc :+ n
}
children.foldRight(Seq.empty[Node]) {
case (Text(left), Text(right) +: accMinusLast) => Text(left + right) +: accMinusLast
case (n, acc) => n +: acc
}
Copy link
Member

@ashawley ashawley May 11, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't aware you can pattern match the last element in a list

It is pattern matching the front of the list with foldRight ("fold right starts from the left" is how I remember it). Is it important to start from the end? I presume it's not. You're just trying to merge adjacent Texts I think.

Copy link
Contributor Author

@EdgeCaseBerg EdgeCaseBerg May 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops sorry, I think I wrote that when I was tired this morning and reading +: as :+ and thinking out loud about

scala> val (last :+ list) = Seq(1,2,3,4)
last: Seq[Int] = List(1, 2, 3)
list: Int = 4

Correct that the order doesn't matter so long as the accumulated list is properly prepended/appended according to the direction it was traversed.

Copy link
Member

@ashawley ashawley May 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, ok. Yeah, it's a lot for a person to keep in their head... between the colons, plus signs and foldings.

}

Expand Down