Skip to content
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.

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

fix(#16458): regression in xml syntax parsing #19522

Merged
merged 3 commits into from
Feb 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ object MarkupParsers {
while {
xSpaceOpt()
nextch()
ts.append(element)
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't understand why my previous fix 624a6e0 used ts.append(element) instead of content_LT(ts) which is what scala 2 has. (I would expect the codebases not to diverge much.)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't know why too, but I suspect it was just a mistake as element cannot consume XML special nodes.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Contributor

@som-snytt som-snytt Jan 25, 2024

Choose a reason for hiding this comment

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

Yes, that is what I was comparing. oh, my previous comment says just that.

It was a quick fix, but the scala 2 pr was also my quick fix, so I have no idea what happened that day. Thanks for following it up.

content_LT(ts)
charComingAfter(xSpaceOpt()) == '<'
} do ()
handle.makeXMLseq(Span(start, curOffset, start), ts)
Expand Down
54 changes: 54 additions & 0 deletions tests/run/i16458.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@

object Test {
import scala.xml.*
def main(args: Array[String]): Unit = {
val xml = <div>FooBar</div><!-- /.modal-content -->
Copy link
Contributor Author

@i10416 i10416 Jan 24, 2024

Choose a reason for hiding this comment

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

Replaced tests/pos/i16458.scala with tests/run/i16458.scala to make sure we get expected parse result.

assert(
xml match
case Seq(elm: Elem, comment: Comment) if
elm.label == "div" &&
elm.child(0) == Atom(Text("FooBar")) &&
comment.label == " /.modal-content "
=> true
case _ => false
,
xml
)
}
}

package scala.xml {
type MetaData = AnyRef

trait NamespaceBinding
object TopScope extends NamespaceBinding
object Null
abstract class Node {
def label: String
def child: Seq[Node]
override def toString = label + child.mkString
}
class Comment(commentText: String) extends Node{
def label = commentText
def child = Nil
}
class Elem(prefix: String, val label: String, attributes1: MetaData, scope: NamespaceBinding, minimizeEmpty: Boolean, val child: Node*) extends Node
class NodeBuffer extends Seq[Node] {
val nodes = scala.collection.mutable.ArrayBuffer.empty[Node]
def &+(o: Any): NodeBuffer =
o match {
case n: Node => nodes.addOne(n) ; this
case t: Text => nodes.addOne(Atom(t)) ; this
}
// Members declared in scala.collection.IterableOnce
def iterator: Iterator[scala.xml.Node] = nodes.iterator
// Members declared in scala.collection.SeqOps
def apply(i: Int): scala.xml.Node = nodes(i)
def length: Int = nodes.length
}
case class Text(text: String)
case class Atom(t: Text) extends Node {
def label = t.text
def child = Nil
}
}
Loading