| author | wenzelm | 
| Fri, 11 Mar 2022 19:55:03 +0100 | |
| changeset 75270 | 0db7ed23c9c7 | 
| parent 73368 | 894f29abe5fc | 
| child 75393 | 87ebf5a50283 | 
| permissions | -rw-r--r-- | 
| 34268 | 1 | /* Title: Pure/Thy/thy_syntax.scala | 
| 2 | Author: Makarius | |
| 3 | ||
| 38374 | 4 | Superficial theory syntax: tokens and spans. | 
| 34268 | 5 | */ | 
| 6 | ||
| 7 | package isabelle | |
| 8 | ||
| 9 | ||
| 38239 
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
 wenzelm parents: 
36956diff
changeset | 10 | import scala.collection.mutable | 
| 38374 | 11 | import scala.annotation.tailrec | 
| 38239 
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
 wenzelm parents: 
36956diff
changeset | 12 | |
| 
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
 wenzelm parents: 
36956diff
changeset | 13 | |
| 34303 | 14 | object Thy_Syntax | 
| 34268 | 15 | {
 | 
| 44436 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 wenzelm parents: 
44388diff
changeset | 16 | /** perspective **/ | 
| 44388 | 17 | |
| 52861 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 18 | def command_perspective( | 
| 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 19 | node: Document.Node, | 
| 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 20 | perspective: Text.Perspective, | 
| 52887 | 21 | overlays: Document.Node.Overlays): (Command.Perspective, Command.Perspective) = | 
| 44388 | 22 |   {
 | 
| 52861 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 23 | if (perspective.is_empty && overlays.is_empty) | 
| 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 24 | (Command.Perspective.empty, Command.Perspective.empty) | 
| 44388 | 25 |     else {
 | 
| 52861 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 26 | val has_overlay = overlays.commands | 
| 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 27 | val visible = new mutable.ListBuffer[Command] | 
| 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 28 | val visible_overlay = new mutable.ListBuffer[Command] | 
| 44388 | 29 | @tailrec | 
| 73368 | 30 | def check_ranges(ranges: List[Text.Range], commands: LazyList[(Command, Text.Offset)]): Unit = | 
| 44388 | 31 |       {
 | 
| 32 |         (ranges, commands) match {
 | |
| 33 | case (range :: more_ranges, (command, offset) #:: more_commands) => | |
| 34 | val command_range = command.range + offset | |
| 35 |             range compare command_range match {
 | |
| 36 | case 0 => | |
| 52861 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 37 | visible += command | 
| 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 38 | visible_overlay += command | 
| 44388 | 39 | check_ranges(ranges, more_commands) | 
| 52861 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 40 | case c => | 
| 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 41 | if (has_overlay(command)) visible_overlay += command | 
| 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 42 | |
| 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 43 | if (c < 0) check_ranges(more_ranges, commands) | 
| 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 44 | else check_ranges(ranges, more_commands) | 
| 44388 | 45 | } | 
| 52861 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 46 | |
| 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 47 | case (Nil, (command, _) #:: more_commands) => | 
| 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 48 | if (has_overlay(command)) visible_overlay += command | 
| 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 49 | |
| 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 50 | check_ranges(Nil, more_commands) | 
| 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 51 | |
| 44388 | 52 | case _ => | 
| 53 | } | |
| 54 | } | |
| 52861 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 55 | |
| 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 56 | val commands = | 
| 56373 
0605d90be6fc
tuned signature -- more explicit iterator terminology;
 wenzelm parents: 
56372diff
changeset | 57 | (if (overlays.is_empty) node.command_iterator(perspective.range) | 
| 73368 | 58 | else node.command_iterator()).to(LazyList) | 
| 56373 
0605d90be6fc
tuned signature -- more explicit iterator terminology;
 wenzelm parents: 
56372diff
changeset | 59 | check_ranges(perspective.ranges, commands) | 
| 52861 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 60 | (Command.Perspective(visible.toList), Command.Perspective(visible_overlay.toList)) | 
| 44388 | 61 | } | 
| 62 | } | |
| 63 | ||
| 64 | ||
| 65 | ||
| 59699 | 66 | /** header edits: graph structure and outer syntax **/ | 
| 46946 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 67 | |
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 68 | private def header_edits( | 
| 56394 
bbf4d512f395
clarified Version.syntax -- avoid guessing initial situation;
 wenzelm parents: 
56393diff
changeset | 69 | resources: Resources, | 
| 46946 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 70 | previous: Document.Version, | 
| 55134 
1b67b17cdad5
propagate update of outer syntax keywords: global propertiesChanged, buffer TokenMarker.markTokens, text area repainting;
 wenzelm parents: 
55118diff
changeset | 71 | edits: List[Document.Edit_Text]): | 
| 59077 
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
 wenzelm parents: 
57906diff
changeset | 72 | (List[Document.Node.Name], Document.Nodes, List[Document.Edit_Command]) = | 
| 46946 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 73 |   {
 | 
| 59077 
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
 wenzelm parents: 
57906diff
changeset | 74 | val syntax_changed0 = new mutable.ListBuffer[Document.Node.Name] | 
| 46946 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 75 | var nodes = previous.nodes | 
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 76 | val doc_edits = new mutable.ListBuffer[Document.Edit_Command] | 
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 77 | |
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 78 |     edits foreach {
 | 
| 48707 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 wenzelm parents: 
48706diff
changeset | 79 | case (name, Document.Node.Deps(header)) => | 
| 46946 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 80 | val node = nodes(name) | 
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 81 | val update_header = | 
| 59319 | 82 | node.header.errors.nonEmpty || header.errors.nonEmpty || node.header != header | 
| 46946 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 83 |         if (update_header) {
 | 
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 84 | val node1 = node.update_header(header) | 
| 70638 
f164cec7ac22
clarified signature: prefer operations without position;
 wenzelm parents: 
70625diff
changeset | 85 | if (node.header.imports != node1.header.imports || | 
| 60197 | 86 | node.header.keywords != node1.header.keywords || | 
| 63579 | 87 | node.header.abbrevs != node1.header.abbrevs || | 
| 60197 | 88 | node.header.errors != node1.header.errors) syntax_changed0 += name | 
| 46946 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 89 | nodes += (name -> node1) | 
| 48707 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 wenzelm parents: 
48706diff
changeset | 90 | doc_edits += (name -> Document.Node.Deps(header)) | 
| 46946 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 91 | } | 
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 92 | case _ => | 
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 93 | } | 
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 94 | |
| 59077 
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
 wenzelm parents: 
57906diff
changeset | 95 | val syntax_changed = nodes.descendants(syntax_changed0.toList) | 
| 46946 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 96 | |
| 59077 
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
 wenzelm parents: 
57906diff
changeset | 97 |     for (name <- syntax_changed) {
 | 
| 
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
 wenzelm parents: 
57906diff
changeset | 98 | val node = nodes(name) | 
| 
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
 wenzelm parents: 
57906diff
changeset | 99 | val syntax = | 
| 
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
 wenzelm parents: 
57906diff
changeset | 100 | if (node.is_empty) None | 
| 
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
 wenzelm parents: 
57906diff
changeset | 101 |         else {
 | 
| 59086 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59077diff
changeset | 102 | val header = node.header | 
| 66721 
ae38b8c0fdd9
more accurate node_syntax: avoid overall_syntax for PIDE edits;
 wenzelm parents: 
66720diff
changeset | 103 | val imports_syntax = | 
| 66772 | 104 |             if (header.imports.nonEmpty) {
 | 
| 70638 
f164cec7ac22
clarified signature: prefer operations without position;
 wenzelm parents: 
70625diff
changeset | 105 | Outer_Syntax.merge(header.imports.map(resources.session_base.node_syntax(nodes, _))) | 
| 66772 | 106 | } | 
| 107 | else resources.session_base.overall_syntax | |
| 66721 
ae38b8c0fdd9
more accurate node_syntax: avoid overall_syntax for PIDE edits;
 wenzelm parents: 
66720diff
changeset | 108 | Some(imports_syntax + header) | 
| 59077 
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
 wenzelm parents: 
57906diff
changeset | 109 | } | 
| 
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
 wenzelm parents: 
57906diff
changeset | 110 | nodes += (name -> node.update_syntax(syntax)) | 
| 
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
 wenzelm parents: 
57906diff
changeset | 111 | } | 
| 46946 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 112 | |
| 59077 
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
 wenzelm parents: 
57906diff
changeset | 113 | (syntax_changed, nodes, doc_edits.toList) | 
| 46946 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 114 | } | 
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 115 | |
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 116 | |
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 117 | |
| 38374 | 118 | /** text edits **/ | 
| 119 | ||
| 48755 
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
 wenzelm parents: 
48754diff
changeset | 120 | /* edit individual command source */ | 
| 46946 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 121 | |
| 50761 | 122 | @tailrec def edit_text(eds: List[Text.Edit], commands: Linear_Set[Command]): Linear_Set[Command] = | 
| 46946 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 123 |   {
 | 
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 124 |     eds match {
 | 
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 125 | case e :: es => | 
| 65074 
df14a0e872e6
improved performance of remove, e.g. relevant for Theories_Dockable.purge;
 wenzelm parents: 
64854diff
changeset | 126 | def insert_text(cmd: Option[Command], text: String): Linear_Set[Command] = | 
| 65341 | 127 | if (text == "") commands else commands.insert_after(cmd, Command.text(text)) | 
| 65074 
df14a0e872e6
improved performance of remove, e.g. relevant for Theories_Dockable.purge;
 wenzelm parents: 
64854diff
changeset | 128 | |
| 52901 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52887diff
changeset | 129 |         Document.Node.Commands.starts(commands.iterator).find {
 | 
| 46946 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 130 | case (cmd, cmd_start) => | 
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 131 | e.can_edit(cmd.source, cmd_start) || | 
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 132 | e.is_insert && e.start == cmd_start + cmd.length | 
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 133 |         } match {
 | 
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 134 | case Some((cmd, cmd_start)) if e.can_edit(cmd.source, cmd_start) => | 
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 135 | val (rest, text) = e.edit(cmd.source, cmd_start) | 
| 65074 
df14a0e872e6
improved performance of remove, e.g. relevant for Theories_Dockable.purge;
 wenzelm parents: 
64854diff
changeset | 136 | val new_commands = insert_text(Some(cmd), text) - cmd | 
| 46946 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 137 | edit_text(rest.toList ::: es, new_commands) | 
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 138 | |
| 71601 | 139 | case Some((cmd, _)) => | 
| 65074 
df14a0e872e6
improved performance of remove, e.g. relevant for Theories_Dockable.purge;
 wenzelm parents: 
64854diff
changeset | 140 | edit_text(es, insert_text(Some(cmd), e.text)) | 
| 46946 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 141 | |
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 142 | case None => | 
| 73120 
c3589f2dff31
more informative errors: simplify diagnosis of spurious failures reported by users;
 wenzelm parents: 
71601diff
changeset | 143 | require(e.is_insert && e.start == 0, "bad text edit") | 
| 65074 
df14a0e872e6
improved performance of remove, e.g. relevant for Theories_Dockable.purge;
 wenzelm parents: 
64854diff
changeset | 144 | edit_text(es, insert_text(None, e.text)) | 
| 46946 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 145 | } | 
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 146 | case Nil => commands | 
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 147 | } | 
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 148 | } | 
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 149 | |
| 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 150 | |
| 48755 
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
 wenzelm parents: 
48754diff
changeset | 151 | /* reparse range of command spans */ | 
| 46946 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 152 | |
| 48748 
89b4e7d83d6f
refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
 wenzelm parents: 
48747diff
changeset | 153 | @tailrec private def chop_common( | 
| 55779 | 154 | cmds: List[Command], | 
| 59702 
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
 wenzelm parents: 
59699diff
changeset | 155 | blobs_spans: List[(Command.Blobs_Info, Command_Span.Span)]) | 
| 
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
 wenzelm parents: 
59699diff
changeset | 156 | : (List[Command], List[(Command.Blobs_Info, Command_Span.Span)]) = | 
| 55779 | 157 |   {
 | 
| 158 |     (cmds, blobs_spans) match {
 | |
| 59803 
88a89f01fc27
proper comparison of blobs_info (amending illtyped equality from 86a76300137e) -- avoid redundant update of unchanged commands;
 wenzelm parents: 
59705diff
changeset | 159 | case (cmd :: cmds, (blobs_info, span) :: rest) | 
| 
88a89f01fc27
proper comparison of blobs_info (amending illtyped equality from 86a76300137e) -- avoid redundant update of unchanged commands;
 wenzelm parents: 
59705diff
changeset | 160 | if cmd.blobs_info == blobs_info && cmd.span == span => chop_common(cmds, rest) | 
| 55779 | 161 | case _ => (cmds, blobs_spans) | 
| 48748 
89b4e7d83d6f
refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
 wenzelm parents: 
48747diff
changeset | 162 | } | 
| 55779 | 163 | } | 
| 48748 
89b4e7d83d6f
refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
 wenzelm parents: 
48747diff
changeset | 164 | |
| 48754 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 wenzelm parents: 
48748diff
changeset | 165 | private def reparse_spans( | 
| 56208 | 166 | resources: Resources, | 
| 63584 
68751fe1c036
tuned signature -- prover-independence is presently theoretical;
 wenzelm parents: 
63579diff
changeset | 167 | syntax: Outer_Syntax, | 
| 56336 | 168 | get_blob: Document.Node.Name => Option[Document.Blob], | 
| 59702 
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
 wenzelm parents: 
59699diff
changeset | 169 | can_import: Document.Node.Name => Boolean, | 
| 59699 | 170 | node_name: Document.Node.Name, | 
| 48754 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 wenzelm parents: 
48748diff
changeset | 171 | commands: Linear_Set[Command], | 
| 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 wenzelm parents: 
48748diff
changeset | 172 | first: Command, last: Command): Linear_Set[Command] = | 
| 48748 
89b4e7d83d6f
refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
 wenzelm parents: 
48747diff
changeset | 173 |   {
 | 
| 48754 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 wenzelm parents: 
48748diff
changeset | 174 | val cmds0 = commands.iterator(first, last).toList | 
| 55779 | 175 | val blobs_spans0 = | 
| 59702 
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
 wenzelm parents: 
59699diff
changeset | 176 | syntax.parse_spans(cmds0.iterator.map(_.source).mkString).map(span => | 
| 59705 | 177 | (Command.blobs_info(resources, syntax, get_blob, can_import, node_name, span), span)) | 
| 48754 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 wenzelm parents: 
48748diff
changeset | 178 | |
| 55779 | 179 | val (cmds1, blobs_spans1) = chop_common(cmds0, blobs_spans0) | 
| 48754 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 wenzelm parents: 
48748diff
changeset | 180 | |
| 55779 | 181 | val (rev_cmds2, rev_blobs_spans2) = chop_common(cmds1.reverse, blobs_spans1.reverse) | 
| 48754 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 wenzelm parents: 
48748diff
changeset | 182 | val cmds2 = rev_cmds2.reverse | 
| 55779 | 183 | val blobs_spans2 = rev_blobs_spans2.reverse | 
| 48754 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 wenzelm parents: 
48748diff
changeset | 184 | |
| 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 wenzelm parents: 
48748diff
changeset | 185 |     cmds2 match {
 | 
| 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 wenzelm parents: 
48748diff
changeset | 186 | case Nil => | 
| 55779 | 187 | assert(blobs_spans2.isEmpty) | 
| 48754 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 wenzelm parents: 
48748diff
changeset | 188 | commands | 
| 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 wenzelm parents: 
48748diff
changeset | 189 | case cmd :: _ => | 
| 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 wenzelm parents: 
48748diff
changeset | 190 | val hook = commands.prev(cmd) | 
| 54462 | 191 | val inserted = | 
| 59684 | 192 |           blobs_spans2.map({ case (blobs, span) =>
 | 
| 59702 
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
 wenzelm parents: 
59699diff
changeset | 193 | Command(Document_ID.make(), node_name, blobs, span) }) | 
| 73359 | 194 | cmds2.foldLeft(commands)(_ - _).append_after(hook, inserted) | 
| 48754 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 wenzelm parents: 
48748diff
changeset | 195 | } | 
| 48748 
89b4e7d83d6f
refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
 wenzelm parents: 
48747diff
changeset | 196 | } | 
| 
89b4e7d83d6f
refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
 wenzelm parents: 
48747diff
changeset | 197 | |
| 48754 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 wenzelm parents: 
48748diff
changeset | 198 | |
| 48755 
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
 wenzelm parents: 
48754diff
changeset | 199 | /* main */ | 
| 46946 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 200 | |
| 50761 | 201 | def diff_commands(old_cmds: Linear_Set[Command], new_cmds: Linear_Set[Command]) | 
| 52849 | 202 | : List[Command.Edit] = | 
| 48754 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 wenzelm parents: 
48748diff
changeset | 203 |   {
 | 
| 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 wenzelm parents: 
48748diff
changeset | 204 | val removed = old_cmds.iterator.filter(!new_cmds.contains(_)).toList | 
| 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 wenzelm parents: 
48748diff
changeset | 205 | val inserted = new_cmds.iterator.filter(!old_cmds.contains(_)).toList | 
| 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 wenzelm parents: 
48748diff
changeset | 206 | |
| 63866 | 207 | removed.map(cmd => (old_cmds.prev(cmd), None)) reverse_::: | 
| 48754 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 wenzelm parents: 
48748diff
changeset | 208 | inserted.map(cmd => (new_cmds.prev(cmd), Some(cmd))) | 
| 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 wenzelm parents: 
48748diff
changeset | 209 | } | 
| 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 wenzelm parents: 
48748diff
changeset | 210 | |
| 54513 | 211 | private def text_edit( | 
| 56208 | 212 | resources: Resources, | 
| 63584 
68751fe1c036
tuned signature -- prover-independence is presently theoretical;
 wenzelm parents: 
63579diff
changeset | 213 | syntax: Outer_Syntax, | 
| 56336 | 214 | get_blob: Document.Node.Name => Option[Document.Blob], | 
| 59702 
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
 wenzelm parents: 
59699diff
changeset | 215 | can_import: Document.Node.Name => Boolean, | 
| 54513 | 216 | reparse_limit: Int, | 
| 48755 
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
 wenzelm parents: 
48754diff
changeset | 217 | node: Document.Node, edit: Document.Edit_Text): Document.Node = | 
| 
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
 wenzelm parents: 
48754diff
changeset | 218 |   {
 | 
| 59704 | 219 | /* recover command spans after edits */ | 
| 220 | // FIXME somewhat slow | |
| 221 | def recover_spans( | |
| 222 | name: Document.Node.Name, | |
| 223 | perspective: Command.Perspective, | |
| 224 | commands: Linear_Set[Command]): Linear_Set[Command] = | |
| 225 |     {
 | |
| 226 | val is_visible = perspective.commands.toSet | |
| 227 | ||
| 228 | def next_invisible(cmds: Linear_Set[Command], from: Command): Command = | |
| 229 | cmds.iterator(from).dropWhile(cmd => !cmd.is_proper || is_visible(cmd)) | |
| 230 | .find(_.is_proper) getOrElse cmds.last | |
| 231 | ||
| 232 | @tailrec def recover(cmds: Linear_Set[Command]): Linear_Set[Command] = | |
| 233 |         cmds.find(_.is_unparsed) match {
 | |
| 234 | case Some(first_unparsed) => | |
| 235 | val first = next_invisible(cmds.reverse, first_unparsed) | |
| 236 | val last = next_invisible(cmds, first_unparsed) | |
| 237 | recover( | |
| 59705 | 238 | reparse_spans(resources, syntax, get_blob, can_import, name, cmds, first, last)) | 
| 59704 | 239 | case None => cmds | 
| 240 | } | |
| 241 | recover(commands) | |
| 242 | } | |
| 243 | ||
| 48755 
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
 wenzelm parents: 
48754diff
changeset | 244 |     edit match {
 | 
| 56335 
8953d4cc060a
store blob content within document node: aux. files that were once open are made persistent;
 wenzelm parents: 
56316diff
changeset | 245 | case (_, Document.Node.Blob(blob)) => node.init_blob(blob) | 
| 54562 
301a721af68b
clarified node edits sent to prover -- Clear/Blob only required for text edits within editor;
 wenzelm parents: 
54524diff
changeset | 246 | |
| 48755 
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
 wenzelm parents: 
48754diff
changeset | 247 | case (name, Document.Node.Edits(text_edits)) => | 
| 56335 
8953d4cc060a
store blob content within document node: aux. files that were once open are made persistent;
 wenzelm parents: 
56316diff
changeset | 248 |         if (name.is_theory) {
 | 
| 55435 
662e0fd39823
maintain blob edits within history, which is important for Snapshot.convert/revert;
 wenzelm parents: 
55431diff
changeset | 249 | val commands0 = node.commands | 
| 
662e0fd39823
maintain blob edits within history, which is important for Snapshot.convert/revert;
 wenzelm parents: 
55431diff
changeset | 250 | val commands1 = edit_text(text_edits, commands0) | 
| 59705 | 251 | val commands2 = recover_spans(name, node.perspective.visible, commands1) | 
| 55435 
662e0fd39823
maintain blob edits within history, which is important for Snapshot.convert/revert;
 wenzelm parents: 
55431diff
changeset | 252 | node.update_commands(commands2) | 
| 
662e0fd39823
maintain blob edits within history, which is important for Snapshot.convert/revert;
 wenzelm parents: 
55431diff
changeset | 253 | } | 
| 56335 
8953d4cc060a
store blob content within document node: aux. files that were once open are made persistent;
 wenzelm parents: 
56316diff
changeset | 254 | else node | 
| 48755 
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
 wenzelm parents: 
48754diff
changeset | 255 | |
| 
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
 wenzelm parents: 
48754diff
changeset | 256 | case (_, Document.Node.Deps(_)) => node | 
| 
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
 wenzelm parents: 
48754diff
changeset | 257 | |
| 52849 | 258 | case (name, Document.Node.Perspective(required, text_perspective, overlays)) => | 
| 52861 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 259 | val (visible, visible_overlay) = command_perspective(node, text_perspective, overlays) | 
| 52849 | 260 | val perspective: Document.Node.Perspective_Command = | 
| 52861 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 wenzelm parents: 
52849diff
changeset | 261 | Document.Node.Perspective(required, visible_overlay, overlays) | 
| 59372 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 262 | if (node.same_perspective(text_perspective, perspective)) node | 
| 59703 | 263 |         else {
 | 
| 264 | /* consolidate unfinished spans */ | |
| 265 | val is_visible = visible.commands.toSet | |
| 266 | val commands = node.commands | |
| 267 | val commands1 = | |
| 268 | if (is_visible.isEmpty) commands | |
| 269 |             else {
 | |
| 270 |               commands.find(_.is_unfinished) match {
 | |
| 271 | case Some(first_unfinished) => | |
| 272 |                   commands.reverse.find(is_visible) match {
 | |
| 273 | case Some(last_visible) => | |
| 274 | val it = commands.iterator(last_visible) | |
| 275 | var last = last_visible | |
| 276 | var i = 0 | |
| 277 |                       while (i < reparse_limit && it.hasNext) {
 | |
| 73344 | 278 | last = it.next() | 
| 59703 | 279 | i += last.length | 
| 280 | } | |
| 59705 | 281 | reparse_spans(resources, syntax, get_blob, can_import, | 
| 282 | name, commands, first_unfinished, last) | |
| 59703 | 283 | case None => commands | 
| 284 | } | |
| 285 | case None => commands | |
| 286 | } | |
| 287 | } | |
| 288 | node.update_perspective(text_perspective, perspective).update_commands(commands1) | |
| 289 | } | |
| 48755 
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
 wenzelm parents: 
48754diff
changeset | 290 | } | 
| 
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
 wenzelm parents: 
48754diff
changeset | 291 | } | 
| 
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
 wenzelm parents: 
48754diff
changeset | 292 | |
| 56316 
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
 wenzelm parents: 
56315diff
changeset | 293 | def parse_change( | 
| 56208 | 294 | resources: Resources, | 
| 49524 
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
 wenzelm parents: 
49414diff
changeset | 295 | reparse_limit: Int, | 
| 43722 | 296 | previous: Document.Version, | 
| 54521 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 wenzelm parents: 
54519diff
changeset | 297 | doc_blobs: Document.Blobs, | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
66772diff
changeset | 298 | edits: List[Document.Edit_Text], | 
| 70796 
2739631ac368
discontinued pointless dump_checkpoint and share_common_data -- superseded by base logic image in Isabelle/MMT;
 wenzelm parents: 
70638diff
changeset | 299 | consolidate: List[Document.Node.Name]): Session.Change = | 
| 38374 | 300 |   {
 | 
| 59702 
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
 wenzelm parents: 
59699diff
changeset | 301 | val (syntax_changed, nodes0, doc_edits0) = header_edits(resources, previous, edits) | 
| 
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
 wenzelm parents: 
59699diff
changeset | 302 | |
| 69559 | 303 | def get_blob(name: Document.Node.Name): Option[Document.Blob] = | 
| 56336 | 304 | doc_blobs.get(name) orElse previous.nodes(name).get_blob | 
| 305 | ||
| 59702 
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
 wenzelm parents: 
59699diff
changeset | 306 | def can_import(name: Document.Node.Name): Boolean = | 
| 65361 | 307 | resources.session_base.loaded_theory(name) || nodes0(name).has_header | 
| 54518 
81a9a54c57fc
always reparse nodes with thy_load commands, to update inlined files;
 wenzelm parents: 
54517diff
changeset | 308 | |
| 56316 
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
 wenzelm parents: 
56315diff
changeset | 309 | val (doc_edits, version) = | 
| 59077 
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
 wenzelm parents: 
57906diff
changeset | 310 | if (edits.isEmpty) (Nil, Document.Version.make(previous.nodes)) | 
| 56316 
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
 wenzelm parents: 
56315diff
changeset | 311 |       else {
 | 
| 
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
 wenzelm parents: 
56315diff
changeset | 312 | val reparse = | 
| 73359 | 313 |           nodes0.iterator.foldLeft(syntax_changed) {
 | 
| 56316 
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
 wenzelm parents: 
56315diff
changeset | 314 | case (reparse, (name, node)) => | 
| 64799 | 315 | if (node.load_commands_changed(doc_blobs) && !reparse.contains(name)) | 
| 56316 
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
 wenzelm parents: 
56315diff
changeset | 316 | name :: reparse | 
| 
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
 wenzelm parents: 
56315diff
changeset | 317 | else reparse | 
| 73359 | 318 | } | 
| 56316 
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
 wenzelm parents: 
56315diff
changeset | 319 | val reparse_set = reparse.toSet | 
| 46946 
acc8ebf980ca
more explicit header_edits before main text_edits;
 wenzelm parents: 
46942diff
changeset | 320 | |
| 56316 
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
 wenzelm parents: 
56315diff
changeset | 321 | var nodes = nodes0 | 
| 
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
 wenzelm parents: 
56315diff
changeset | 322 | val doc_edits = new mutable.ListBuffer[Document.Edit_Command]; doc_edits ++= doc_edits0 | 
| 54521 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 wenzelm parents: 
54519diff
changeset | 323 | |
| 56316 
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
 wenzelm parents: 
56315diff
changeset | 324 | val node_edits = | 
| 
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
 wenzelm parents: 
56315diff
changeset | 325 | (edits ::: reparse.map((_, Document.Node.Edits(Nil)))).groupBy(_._1) | 
| 
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
 wenzelm parents: 
56315diff
changeset | 326 | .asInstanceOf[Map[Document.Node.Name, List[Document.Edit_Text]]] // FIXME ??? | 
| 38374 | 327 | |
| 56316 
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
 wenzelm parents: 
56315diff
changeset | 328 |         node_edits foreach {
 | 
| 
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
 wenzelm parents: 
56315diff
changeset | 329 | case (name, edits) => | 
| 
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
 wenzelm parents: 
56315diff
changeset | 330 | val node = nodes(name) | 
| 66770 
122df1fde073
clarified node_syntax (amending ae38b8c0fdd9): default to overall_syntax, e.g. relevant for command spans wrt. bad header;
 wenzelm parents: 
66721diff
changeset | 331 | val syntax = resources.session_base.node_syntax(nodes, name) | 
| 56316 
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
 wenzelm parents: 
56315diff
changeset | 332 | val commands = node.commands | 
| 48754 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 wenzelm parents: 
48748diff
changeset | 333 | |
| 56316 
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
 wenzelm parents: 
56315diff
changeset | 334 | val node1 = | 
| 59319 | 335 | if (reparse_set(name) && commands.nonEmpty) | 
| 56316 
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
 wenzelm parents: 
56315diff
changeset | 336 | node.update_commands( | 
| 59702 
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
 wenzelm parents: 
59699diff
changeset | 337 | reparse_spans(resources, syntax, get_blob, can_import, name, | 
| 59705 | 338 | commands, commands.head, commands.last)) | 
| 56316 
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
 wenzelm parents: 
56315diff
changeset | 339 | else node | 
| 
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
 wenzelm parents: 
56315diff
changeset | 340 | val node2 = | 
| 73359 | 341 | edits.foldLeft(node1)( | 
| 59702 
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
 wenzelm parents: 
59699diff
changeset | 342 | text_edit(resources, syntax, get_blob, can_import, reparse_limit, _, _)) | 
| 59372 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 343 | val node3 = | 
| 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 344 | if (reparse_set.contains(name)) | 
| 59702 
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
 wenzelm parents: 
59699diff
changeset | 345 | text_edit(resources, syntax, get_blob, can_import, reparse_limit, | 
| 59372 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 346 | node2, (name, node2.edit_perspective)) | 
| 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 347 | else node2 | 
| 54521 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 wenzelm parents: 
54519diff
changeset | 348 | |
| 60215 | 349 | if (!node.same_perspective(node3.text_perspective, node3.perspective)) | 
| 59372 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 350 | doc_edits += (name -> node3.perspective) | 
| 54521 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 wenzelm parents: 
54519diff
changeset | 351 | |
| 59372 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 352 | doc_edits += (name -> Document.Node.Edits(diff_commands(commands, node3.commands))) | 
| 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 353 | |
| 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 354 | nodes += (name -> node3) | 
| 56316 
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
 wenzelm parents: 
56315diff
changeset | 355 | } | 
| 59077 
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
 wenzelm parents: 
57906diff
changeset | 356 | (doc_edits.toList.filterNot(_._2.is_void), Document.Version.make(nodes)) | 
| 54513 | 357 | } | 
| 358 | ||
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
66772diff
changeset | 359 | Session.Change( | 
| 70796 
2739631ac368
discontinued pointless dump_checkpoint and share_common_data -- superseded by base logic image in Isabelle/MMT;
 wenzelm parents: 
70638diff
changeset | 360 | previous, syntax_changed, syntax_changed.nonEmpty, doc_edits, consolidate, version) | 
| 38374 | 361 | } | 
| 34268 | 362 | } |