src/Pure/Tools/server_commands.scala
changeset 77137 79231a210f5d
parent 76852 2915740fce1f
child 77519 12ace037d05e
equal deleted inserted replaced
77136:5bf9a1b78f93 77137:79231a210f5d
   241               Markup.messages.collectFirst({ case (a, b) if b == elem.name =>
   241               Markup.messages.collectFirst({ case (a, b) if b == elem.name =>
   242                 if (Protocol.is_legacy(elem)) Markup.WARNING else a }) getOrElse ""
   242                 if (Protocol.is_legacy(elem)) Markup.WARNING else a }) getOrElse ""
   243             Server.Reply.message(output_text(msg), kind = kind) + position
   243             Server.Reply.message(output_text(msg), kind = kind) + position
   244         }
   244         }
   245       }
   245       }
       
   246 
       
   247       def show_message(tree: XML.Tree): Boolean =
       
   248         Protocol.is_exported(tree) || session.show_states && Protocol.is_state(tree)
   246 
   249 
   247       val result_json =
   250       val result_json =
   248         JSON.Object(
   251         JSON.Object(
   249           "ok" -> result.ok,
   252           "ok" -> result.ok,
   250           "errors" ->
   253           "errors" ->
   257               val snapshot = result.snapshot(name)
   260               val snapshot = result.snapshot(name)
   258               name.json +
   261               name.json +
   259                 ("status" -> status.json) +
   262                 ("status" -> status.json) +
   260                 ("messages" ->
   263                 ("messages" ->
   261                   (for {
   264                   (for {
   262                     (tree, pos) <- snapshot.messages if Protocol.is_exported(tree)
   265                     (tree, pos) <- snapshot.messages if show_message(tree)
   263                   } yield output_message(tree, pos))) +
   266                   } yield output_message(tree, pos))) +
   264                 ("exports" ->
   267                 ("exports" ->
   265                   (if (args.export_pattern == "") Nil else {
   268                   (if (args.export_pattern == "") Nil else {
   266                     val matcher = Export.make_matcher(List(args.export_pattern))
   269                     val matcher = Export.make_matcher(List(args.export_pattern))
   267                     for { entry <- snapshot.exports if matcher(entry.entry_name) }
   270                     for { entry <- snapshot.exports if matcher(entry.entry_name) }