equal
deleted
inserted
replaced
294 resources: Resources, |
294 resources: Resources, |
295 reparse_limit: Int, |
295 reparse_limit: Int, |
296 previous: Document.Version, |
296 previous: Document.Version, |
297 doc_blobs: Document.Blobs, |
297 doc_blobs: Document.Blobs, |
298 edits: List[Document.Edit_Text], |
298 edits: List[Document.Edit_Text], |
299 consolidate: List[Document.Node.Name], |
299 consolidate: List[Document.Node.Name]): Session.Change = |
300 share_common_data: Boolean): Session.Change = |
|
301 { |
300 { |
302 val (syntax_changed, nodes0, doc_edits0) = header_edits(resources, previous, edits) |
301 val (syntax_changed, nodes0, doc_edits0) = header_edits(resources, previous, edits) |
303 |
302 |
304 def get_blob(name: Document.Node.Name): Option[Document.Blob] = |
303 def get_blob(name: Document.Node.Name): Option[Document.Blob] = |
305 doc_blobs.get(name) orElse previous.nodes(name).get_blob |
304 doc_blobs.get(name) orElse previous.nodes(name).get_blob |
356 } |
355 } |
357 (doc_edits.toList.filterNot(_._2.is_void), Document.Version.make(nodes)) |
356 (doc_edits.toList.filterNot(_._2.is_void), Document.Version.make(nodes)) |
358 } |
357 } |
359 |
358 |
360 Session.Change( |
359 Session.Change( |
361 previous, syntax_changed, syntax_changed.nonEmpty, doc_edits, |
360 previous, syntax_changed, syntax_changed.nonEmpty, doc_edits, consolidate, version) |
362 consolidate, share_common_data, version) |
|
363 } |
361 } |
364 } |
362 } |