Skip to content
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
16 changes: 4 additions & 12 deletions core/play/src/main/scala/play/core/parsers/Multipart.scala
Original file line number Diff line number Diff line change
Expand Up @@ -141,19 +141,11 @@ object Multipart:
Right(
MultipartFormData(
parts
.collect { case dp: DataPart =>
dp
}
.collect { case dp: DataPart => dp }
.groupBy(_.key)
.map { case (key, partValues) =>
key -> partValues.map(_.value)
},
parts.collect { case fp: FilePart[A] =>
fp
},
parts.collect { case bad: BadPart =>
bad
}
.map { case (key, partValues) => key -> partValues.map(_.value) },
parts.collect { case fp: FilePart[?] => fp.asInstanceOf[FilePart[A]] },
parts.collect { case bad: BadPart => bad }
)
)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ private[routes] class RoutesFileParser extends JavaTokenParsers:
override def skipWhitespace = false
override val whiteSpace = """[ \t]+""".r

case class ModifiersWithComment(modifiers: List[Modifier], comment: Option[Comment])

def EOF: util.matching.Regex = "\\z".r

def namedError[A](p: Parser[A], msg: String): Parser[A] = Parser[A] { i =>
Expand Down Expand Up @@ -169,8 +171,8 @@ private[routes] class RoutesFileParser extends JavaTokenParsers:
Modifier.apply
))

def modifiersWithComment: Parser[(List[Modifier], Option[Comment])] = modifiers ~ opt(comment) ^^ {
case m ~ c => (m, c)
def modifiersWithComment: Parser[ModifiersWithComment] = modifiers ~ opt(comment) ^^ { case m ~ c =>
ModifiersWithComment(m, c)
}

def newLine: Parser[String] = namedError(("\r" ?) ~> "\n", "End of line expected")
Expand Down Expand Up @@ -325,7 +327,7 @@ private[routes] class RoutesFileParser extends JavaTokenParsers:
case (s, c @ ()) => (None, Nil, Nil) :: s
case ((r, comments, modifiers) :: others, c: Comment) =>
(r, c :: comments, modifiers) :: others
case ((r, comments, modifiers) :: others, (ms: List[Modifier], c: Option[Comment])) =>
case ((r, comments, modifiers) :: others, ModifiersWithComment(ms, c)) =>
(r, c.toList ::: comments, ms ::: modifiers) :: others
case (s, _) => s
}
Expand Down