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