author | wenzelm |
Fri, 05 Jul 2013 15:38:03 +0200 | |
changeset 52530 | 99dd8b4ef3fe |
parent 50761 | f6811984983b |
child 52535 | b7badd371e4d |
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 |
{ |
40454
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
16 |
/** nested structure **/ |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
17 |
|
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
18 |
object Structure |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
19 |
{ |
40478
4bae781b8f7c
replaced Document.Node_Text_Edit by Document.Text_Edit, with treatment of deleted nodes;
wenzelm
parents:
40457
diff
changeset
|
20 |
sealed abstract class Entry { def length: Int } |
40454
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
21 |
case class Block(val name: String, val body: List[Entry]) extends Entry |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
22 |
{ |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
23 |
val length: Int = (0 /: body)(_ + _.length) |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
24 |
} |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
25 |
case class Atom(val command: Command) extends Entry |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
26 |
{ |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
27 |
def length: Int = command.length |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
28 |
} |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
29 |
|
46811
03a2dc9e0624
clarified command span: include trailing whitespace/comments and thus reduce number of ignored spans with associated transactions and states (factor 2);
wenzelm
parents:
46749
diff
changeset
|
30 |
def parse(syntax: Outer_Syntax, node_name: Document.Node.Name, text: CharSequence): Entry = |
40454
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
31 |
{ |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
32 |
/* stack operations */ |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
33 |
|
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
34 |
def buffer(): mutable.ListBuffer[Entry] = new mutable.ListBuffer[Entry] |
44615 | 35 |
var stack: List[(Int, String, mutable.ListBuffer[Entry])] = |
48718 | 36 |
List((0, node_name.theory, buffer())) |
40454
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
37 |
|
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
38 |
@tailrec def close(level: Int => Boolean) |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
39 |
{ |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
40 |
stack match { |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
41 |
case (lev, name, body) :: (_, _, body2) :: rest if level(lev) => |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
42 |
body2 += Block(name, body.toList) |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
43 |
stack = stack.tail |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
44 |
close(level) |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
45 |
case _ => |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
46 |
} |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
47 |
} |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
48 |
|
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
49 |
def result(): Entry = |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
50 |
{ |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
51 |
close(_ => true) |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
52 |
val (_, name, body) = stack.head |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
53 |
Block(name, body.toList) |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
54 |
} |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
55 |
|
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
56 |
def add(command: Command) |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
57 |
{ |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
58 |
syntax.heading_level(command) match { |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
59 |
case Some(i) => |
46969 | 60 |
close(_ > i) |
61 |
stack = (i + 1, command.source, buffer()) :: stack |
|
40454
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
62 |
case None => |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
63 |
} |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
64 |
stack.head._3 += Atom(command) |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
65 |
} |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
66 |
|
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
67 |
|
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
68 |
/* result structure */ |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
69 |
|
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
70 |
val spans = parse_spans(syntax.scan(text)) |
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
50761
diff
changeset
|
71 |
spans.foreach(span => add(Command(Document_ID.none, node_name, span))) |
40454
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
72 |
result() |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
73 |
} |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
74 |
} |
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
75 |
|
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
76 |
|
2516ea25a54b
some support for nested source structure, based on section headings;
wenzelm
parents:
38878
diff
changeset
|
77 |
|
38374 | 78 |
/** parse spans **/ |
79 |
||
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
|
80 |
def parse_spans(toks: List[Token]): List[Command.Span] = |
34268 | 81 |
{ |
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
|
82 |
val result = new mutable.ListBuffer[Command.Span] |
38239
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
wenzelm
parents:
36956
diff
changeset
|
83 |
val span = new mutable.ListBuffer[Token] |
34268 | 84 |
|
46811
03a2dc9e0624
clarified command span: include trailing whitespace/comments and thus reduce number of ignored spans with associated transactions and states (factor 2);
wenzelm
parents:
46749
diff
changeset
|
85 |
def flush() { if (!span.isEmpty) { result += span.toList; span.clear } } |
03a2dc9e0624
clarified command span: include trailing whitespace/comments and thus reduce number of ignored spans with associated transactions and states (factor 2);
wenzelm
parents:
46749
diff
changeset
|
86 |
for (tok <- toks) { if (tok.is_command) flush(); span += tok } |
03a2dc9e0624
clarified command span: include trailing whitespace/comments and thus reduce number of ignored spans with associated transactions and states (factor 2);
wenzelm
parents:
46749
diff
changeset
|
87 |
flush() |
38239
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
wenzelm
parents:
36956
diff
changeset
|
88 |
result.toList |
34268 | 89 |
} |
38374 | 90 |
|
91 |
||
92 |
||
44436
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44388
diff
changeset
|
93 |
/** perspective **/ |
44388 | 94 |
|
95 |
def command_perspective(node: Document.Node, perspective: Text.Perspective): Command.Perspective = |
|
96 |
{ |
|
44474 | 97 |
if (perspective.is_empty) Command.Perspective.empty |
44388 | 98 |
else { |
99 |
val result = new mutable.ListBuffer[Command] |
|
100 |
@tailrec |
|
101 |
def check_ranges(ranges: List[Text.Range], commands: Stream[(Command, Text.Offset)]) |
|
102 |
{ |
|
103 |
(ranges, commands) match { |
|
104 |
case (range :: more_ranges, (command, offset) #:: more_commands) => |
|
105 |
val command_range = command.range + offset |
|
106 |
range compare command_range match { |
|
107 |
case -1 => check_ranges(more_ranges, commands) |
|
108 |
case 0 => |
|
109 |
result += command |
|
110 |
check_ranges(ranges, more_commands) |
|
111 |
case 1 => check_ranges(ranges, more_commands) |
|
112 |
} |
|
113 |
case _ => |
|
114 |
} |
|
115 |
} |
|
44473 | 116 |
check_ranges(perspective.ranges, node.command_range(perspective.range).toStream) |
44474 | 117 |
Command.Perspective(result.toList) |
44388 | 118 |
} |
119 |
} |
|
120 |
||
121 |
||
122 |
||
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
123 |
/** header edits: structure and outer syntax **/ |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
124 |
|
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
125 |
private def header_edits( |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
126 |
base_syntax: Outer_Syntax, |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
127 |
previous: Document.Version, |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
128 |
edits: List[Document.Edit_Text]) |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
129 |
: (Outer_Syntax, List[Document.Node.Name], Document.Nodes, List[Document.Edit_Command]) = |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
130 |
{ |
47987
4e9df6ffcc6e
reparse descendants after update of imports, e.g. required for 'primrec' (line 17 of "src/HOL/Power.thy");
wenzelm
parents:
47346
diff
changeset
|
131 |
var updated_imports = false |
4e9df6ffcc6e
reparse descendants after update of imports, e.g. required for 'primrec' (line 17 of "src/HOL/Power.thy");
wenzelm
parents:
47346
diff
changeset
|
132 |
var updated_keywords = false |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
133 |
var nodes = previous.nodes |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
134 |
val doc_edits = new mutable.ListBuffer[Document.Edit_Command] |
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 |
edits foreach { |
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
48706
diff
changeset
|
137 |
case (name, Document.Node.Deps(header)) => |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
138 |
val node = nodes(name) |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
139 |
val update_header = |
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
48706
diff
changeset
|
140 |
!node.header.errors.isEmpty || !header.errors.isEmpty || node.header != header |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
141 |
if (update_header) { |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
142 |
val node1 = node.update_header(header) |
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
48706
diff
changeset
|
143 |
updated_imports = updated_imports || (node.header.imports != node1.header.imports) |
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
48706
diff
changeset
|
144 |
updated_keywords = updated_keywords || (node.header.keywords != node1.header.keywords) |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
145 |
nodes += (name -> node1) |
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
48706
diff
changeset
|
146 |
doc_edits += (name -> Document.Node.Deps(header)) |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
147 |
} |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
148 |
case _ => |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
149 |
} |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
150 |
|
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
151 |
val syntax = |
47987
4e9df6ffcc6e
reparse descendants after update of imports, e.g. required for 'primrec' (line 17 of "src/HOL/Power.thy");
wenzelm
parents:
47346
diff
changeset
|
152 |
if (previous.is_init || updated_keywords) |
48873 | 153 |
(base_syntax /: nodes.entries) { |
154 |
case (syn, (_, node)) => syn.add_keywords(node.header.keywords) |
|
155 |
} |
|
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
156 |
else previous.syntax |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
157 |
|
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
158 |
val reparse = |
47987
4e9df6ffcc6e
reparse descendants after update of imports, e.g. required for 'primrec' (line 17 of "src/HOL/Power.thy");
wenzelm
parents:
47346
diff
changeset
|
159 |
if (updated_imports || updated_keywords) |
4e9df6ffcc6e
reparse descendants after update of imports, e.g. required for 'primrec' (line 17 of "src/HOL/Power.thy");
wenzelm
parents:
47346
diff
changeset
|
160 |
nodes.descendants(doc_edits.iterator.map(_._1).toList) |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
161 |
else Nil |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
162 |
|
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
163 |
(syntax, reparse, nodes, doc_edits.toList) |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
164 |
} |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
165 |
|
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
166 |
|
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
167 |
|
38374 | 168 |
/** text edits **/ |
169 |
||
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
|
170 |
/* edit individual command source */ |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
171 |
|
50761 | 172 |
@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
|
173 |
{ |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
174 |
eds match { |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
175 |
case e :: es => |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
176 |
Document.Node.command_starts(commands.iterator).find { |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
177 |
case (cmd, cmd_start) => |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
178 |
e.can_edit(cmd.source, cmd_start) || |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
179 |
e.is_insert && e.start == cmd_start + cmd.length |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
180 |
} match { |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
181 |
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
|
182 |
val (rest, text) = e.edit(cmd.source, cmd_start) |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
183 |
val new_commands = commands.insert_after(Some(cmd), Command.unparsed(text)) - cmd |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
184 |
edit_text(rest.toList ::: es, new_commands) |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
185 |
|
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
186 |
case Some((cmd, cmd_start)) => |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
187 |
edit_text(es, commands.insert_after(Some(cmd), Command.unparsed(e.text))) |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
188 |
|
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
189 |
case None => |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
190 |
require(e.is_insert && e.start == 0) |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
191 |
edit_text(es, commands.insert_after(None, Command.unparsed(e.text))) |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
192 |
} |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
193 |
case Nil => commands |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
194 |
} |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
195 |
} |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
196 |
|
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
197 |
|
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
|
198 |
/* reparse range of command spans */ |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
199 |
|
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
|
200 |
@tailrec private def chop_common( |
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
|
201 |
cmds: List[Command], spans: List[Command.Span]): (List[Command], List[Command.Span]) = |
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
|
202 |
(cmds, spans) match { |
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
|
203 |
case (c :: cs, s :: ss) if c.span == s => chop_common(cs, ss) |
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
|
204 |
case _ => (cmds, spans) |
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
|
205 |
} |
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
|
206 |
|
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
207 |
private def reparse_spans( |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
208 |
syntax: Outer_Syntax, |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
209 |
name: Document.Node.Name, |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
210 |
commands: Linear_Set[Command], |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
211 |
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
|
212 |
{ |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
213 |
val cmds0 = commands.iterator(first, last).toList |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
214 |
val spans0 = parse_spans(syntax.scan(cmds0.iterator.map(_.source).mkString)) |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
215 |
|
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
216 |
val (cmds1, spans1) = chop_common(cmds0, spans0) |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
217 |
|
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
|
218 |
val (rev_cmds2, rev_spans2) = chop_common(cmds1.reverse, spans1.reverse) |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
219 |
val cmds2 = rev_cmds2.reverse |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
220 |
val spans2 = rev_spans2.reverse |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
221 |
|
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
222 |
cmds2 match { |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
223 |
case Nil => |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
224 |
assert(spans2.isEmpty) |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
225 |
commands |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
226 |
case cmd :: _ => |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
227 |
val hook = commands.prev(cmd) |
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
50761
diff
changeset
|
228 |
val inserted = spans2.map(span => Command(Document_ID.make(), name, span)) |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
229 |
(commands /: cmds2)(_ - _).append_after(hook, inserted) |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
230 |
} |
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
|
231 |
} |
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
|
232 |
|
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
233 |
|
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
|
234 |
/* recover command spans after edits */ |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
235 |
|
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
|
236 |
// FIXME somewhat slow |
48746
9e1b2aafbc7f
more direct Linear_Set.reverse, swapping orientation of the graph;
wenzelm
parents:
48718
diff
changeset
|
237 |
private def recover_spans( |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
238 |
syntax: Outer_Syntax, |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
239 |
name: Document.Node.Name, |
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
|
240 |
perspective: Command.Perspective, |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
241 |
commands: Linear_Set[Command]): Linear_Set[Command] = |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
242 |
{ |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
243 |
val visible = perspective.commands.toSet |
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
|
244 |
|
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
245 |
def next_invisible_command(cmds: Linear_Set[Command], from: Command): Command = |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
246 |
cmds.iterator(from).dropWhile(cmd => !cmd.is_command || visible(cmd)) |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
247 |
.find(_.is_command) getOrElse cmds.last |
48746
9e1b2aafbc7f
more direct Linear_Set.reverse, swapping orientation of the graph;
wenzelm
parents:
48718
diff
changeset
|
248 |
|
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
249 |
@tailrec def recover(cmds: Linear_Set[Command]): Linear_Set[Command] = |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
250 |
cmds.find(_.is_unparsed) match { |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
251 |
case Some(first_unparsed) => |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
252 |
val first = next_invisible_command(cmds.reverse, first_unparsed) |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
253 |
val last = next_invisible_command(cmds, first_unparsed) |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
254 |
recover(reparse_spans(syntax, name, cmds, first, last)) |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
255 |
case None => cmds |
48746
9e1b2aafbc7f
more direct Linear_Set.reverse, swapping orientation of the graph;
wenzelm
parents:
48718
diff
changeset
|
256 |
} |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
257 |
recover(commands) |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
258 |
} |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
259 |
|
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
260 |
|
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
|
261 |
/* consolidate unfinished spans */ |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
262 |
|
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
263 |
private def consolidate_spans( |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
264 |
syntax: Outer_Syntax, |
49524
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
265 |
reparse_limit: Int, |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
266 |
name: Document.Node.Name, |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
267 |
perspective: Command.Perspective, |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
268 |
commands: Linear_Set[Command]): Linear_Set[Command] = |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
269 |
{ |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
270 |
if (perspective.commands.isEmpty) commands |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
271 |
else { |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
272 |
commands.find(_.is_unfinished) match { |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
273 |
case Some(first_unfinished) => |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
274 |
val visible = perspective.commands.toSet |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
275 |
commands.reverse.find(visible) match { |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
276 |
case Some(last_visible) => |
49524
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
277 |
val it = commands.iterator(last_visible) |
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
278 |
var last = last_visible |
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
279 |
var i = 0 |
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
280 |
while (i < reparse_limit && it.hasNext) { |
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
281 |
last = it.next |
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
282 |
i += last.length |
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
283 |
} |
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
284 |
reparse_spans(syntax, name, commands, first_unfinished, last) |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
285 |
case None => commands |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
286 |
} |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
287 |
case None => commands |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
288 |
} |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
289 |
} |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
290 |
} |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
291 |
|
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
292 |
|
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
|
293 |
/* main */ |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
294 |
|
50761 | 295 |
def diff_commands(old_cmds: Linear_Set[Command], new_cmds: Linear_Set[Command]) |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
296 |
: List[(Option[Command], Option[Command])] = |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
297 |
{ |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
298 |
val removed = old_cmds.iterator.filter(!new_cmds.contains(_)).toList |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
299 |
val inserted = new_cmds.iterator.filter(!old_cmds.contains(_)).toList |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
300 |
|
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
301 |
removed.reverse.map(cmd => (old_cmds.prev(cmd), None)) ::: |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
302 |
inserted.map(cmd => (new_cmds.prev(cmd), Some(cmd))) |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
303 |
} |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
304 |
|
49524
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
305 |
private def text_edit(syntax: Outer_Syntax, 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
|
306 |
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
|
307 |
{ |
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
|
308 |
edit match { |
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
|
309 |
case (_, Document.Node.Clear()) => node.clear |
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
|
310 |
|
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
|
311 |
case (name, Document.Node.Edits(text_edits)) => |
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
|
312 |
val commands0 = node.commands |
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
|
313 |
val commands1 = edit_text(text_edits, commands0) |
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
|
314 |
val commands2 = recover_spans(syntax, name, node.perspective, commands1) |
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
|
315 |
node.update_commands(commands2) |
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
|
316 |
|
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
|
317 |
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
|
318 |
|
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
|
319 |
case (name, Document.Node.Perspective(text_perspective)) => |
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
|
320 |
val perspective = command_perspective(node, text_perspective) |
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
|
321 |
if (node.perspective same perspective) 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
|
322 |
else |
49524
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
323 |
node.update_perspective(perspective).update_commands( |
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
324 |
consolidate_spans(syntax, reparse_limit, name, perspective, node.commands)) |
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
|
325 |
} |
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
|
326 |
} |
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
|
327 |
|
43722 | 328 |
def text_edits( |
46942
f5c2d66faa04
basic support for outer syntax keywords in theory header;
wenzelm
parents:
46941
diff
changeset
|
329 |
base_syntax: Outer_Syntax, |
49524
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
330 |
reparse_limit: Int, |
43722 | 331 |
previous: Document.Version, |
44157
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
332 |
edits: List[Document.Edit_Text]) |
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
333 |
: (List[Document.Edit_Command], Document.Version) = |
38374 | 334 |
{ |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
335 |
val (syntax, reparse, nodes0, doc_edits0) = header_edits(base_syntax, previous, edits) |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
336 |
val reparse_set = reparse.toSet |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
337 |
|
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
338 |
var nodes = nodes0 |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
339 |
val doc_edits = new mutable.ListBuffer[Document.Edit_Command]; doc_edits ++= doc_edits0 |
38374 | 340 |
|
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
|
341 |
val node_edits = |
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
|
342 |
(edits ::: reparse.map((_, Document.Node.Edits(Nil)))).groupBy(_._1) |
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
|
343 |
.asInstanceOf[Map[Document.Node.Name, List[Document.Edit_Text]]] // FIXME ??? |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
344 |
|
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
|
345 |
node_edits foreach { |
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
|
346 |
case (name, edits) => |
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
|
347 |
val node = nodes(name) |
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
|
348 |
val commands = node.commands |
38374 | 349 |
|
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
|
350 |
val node1 = |
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
|
351 |
if (reparse_set(name) && !commands.isEmpty) |
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
|
352 |
node.update_commands(reparse_spans(syntax, name, commands, commands.head, commands.last)) |
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
|
353 |
else node |
49524
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
354 |
val node2 = (node1 /: edits)(text_edit(syntax, reparse_limit, _, _)) |
38374 | 355 |
|
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
|
356 |
if (!(node.perspective same node2.perspective)) |
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
|
357 |
doc_edits += (name -> Document.Node.Perspective(node2.perspective)) |
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
|
358 |
|
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
|
359 |
doc_edits += (name -> Document.Node.Edits(diff_commands(commands, node2.commands))) |
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
|
360 |
|
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
|
361 |
nodes += (name -> node2) |
38374 | 362 |
} |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
363 |
|
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
364 |
(doc_edits.toList, Document.Version.make(syntax, nodes)) |
38374 | 365 |
} |
34268 | 366 |
} |