| author | wenzelm | 
| Tue, 25 Mar 2014 14:52:35 +0100 | |
| changeset 56276 | 9e2d5e3debd3 | 
| parent 56208 | 06cc31dff138 | 
| child 56314 | 9a513737a0b2 | 
| 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])] =  | 
| 54515 | 36  | 
List((0, node_name.toString, 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))  | 
| 
54519
 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 
wenzelm 
parents: 
54518 
diff
changeset
 | 
71  | 
spans.foreach(span => add(Command(Document_ID.none, node_name, Nil, 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  | 
||
| 
52535
 
b7badd371e4d
tuned signature -- eliminated pointless type synonym;
 
wenzelm 
parents: 
52530 
diff
changeset
 | 
80  | 
def parse_spans(toks: List[Token]): List[List[Token]] =  | 
| 34268 | 81  | 
  {
 | 
| 
52535
 
b7badd371e4d
tuned signature -- eliminated pointless type synonym;
 
wenzelm 
parents: 
52530 
diff
changeset
 | 
82  | 
val result = new mutable.ListBuffer[List[Token]]  | 
| 
38239
 
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
 
wenzelm 
parents: 
36956 
diff
changeset
 | 
83  | 
val span = new mutable.ListBuffer[Token]  | 
| 
53843
 
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
 
wenzelm 
parents: 
52901 
diff
changeset
 | 
84  | 
val improper = new mutable.ListBuffer[Token]  | 
| 34268 | 85  | 
|
| 
53843
 
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
 
wenzelm 
parents: 
52901 
diff
changeset
 | 
86  | 
def flush()  | 
| 
 
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
 
wenzelm 
parents: 
52901 
diff
changeset
 | 
87  | 
    {
 | 
| 
 
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
 
wenzelm 
parents: 
52901 
diff
changeset
 | 
88  | 
      if (!span.isEmpty) { result += span.toList; span.clear }
 | 
| 
 
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
 
wenzelm 
parents: 
52901 
diff
changeset
 | 
89  | 
      if (!improper.isEmpty) { result += improper.toList; improper.clear }
 | 
| 
 
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
 
wenzelm 
parents: 
52901 
diff
changeset
 | 
90  | 
}  | 
| 
 
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
 
wenzelm 
parents: 
52901 
diff
changeset
 | 
91  | 
    for (tok <- toks) {
 | 
| 
 
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
 
wenzelm 
parents: 
52901 
diff
changeset
 | 
92  | 
      if (tok.is_command) { flush(); span += tok }
 | 
| 
 
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
 
wenzelm 
parents: 
52901 
diff
changeset
 | 
93  | 
else if (tok.is_improper) improper += tok  | 
| 
 
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
 
wenzelm 
parents: 
52901 
diff
changeset
 | 
94  | 
      else { span ++= improper; improper.clear; span += tok }
 | 
| 
 
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
 
wenzelm 
parents: 
52901 
diff
changeset
 | 
95  | 
}  | 
| 
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
 | 
96  | 
flush()  | 
| 
53843
 
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
 
wenzelm 
parents: 
52901 
diff
changeset
 | 
97  | 
|
| 
38239
 
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
 
wenzelm 
parents: 
36956 
diff
changeset
 | 
98  | 
result.toList  | 
| 34268 | 99  | 
}  | 
| 38374 | 100  | 
|
101  | 
||
102  | 
||
| 
44436
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
103  | 
/** perspective **/  | 
| 44388 | 104  | 
|
| 
52861
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
105  | 
def command_perspective(  | 
| 
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
106  | 
node: Document.Node,  | 
| 
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
107  | 
perspective: Text.Perspective,  | 
| 52887 | 108  | 
overlays: Document.Node.Overlays): (Command.Perspective, Command.Perspective) =  | 
| 44388 | 109  | 
  {
 | 
| 
52861
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
110  | 
if (perspective.is_empty && overlays.is_empty)  | 
| 
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
111  | 
(Command.Perspective.empty, Command.Perspective.empty)  | 
| 44388 | 112  | 
    else {
 | 
| 
52861
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
113  | 
val has_overlay = overlays.commands  | 
| 
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
114  | 
val visible = new mutable.ListBuffer[Command]  | 
| 
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
115  | 
val visible_overlay = new mutable.ListBuffer[Command]  | 
| 44388 | 116  | 
@tailrec  | 
117  | 
def check_ranges(ranges: List[Text.Range], commands: Stream[(Command, Text.Offset)])  | 
|
118  | 
      {
 | 
|
119  | 
        (ranges, commands) match {
 | 
|
120  | 
case (range :: more_ranges, (command, offset) #:: more_commands) =>  | 
|
121  | 
val command_range = command.range + offset  | 
|
122  | 
            range compare command_range match {
 | 
|
123  | 
case 0 =>  | 
|
| 
52861
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
124  | 
visible += command  | 
| 
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
125  | 
visible_overlay += command  | 
| 44388 | 126  | 
check_ranges(ranges, more_commands)  | 
| 
52861
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
127  | 
case c =>  | 
| 
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
128  | 
if (has_overlay(command)) visible_overlay += command  | 
| 
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
129  | 
|
| 
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
130  | 
if (c < 0) check_ranges(more_ranges, commands)  | 
| 
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
131  | 
else check_ranges(ranges, more_commands)  | 
| 44388 | 132  | 
}  | 
| 
52861
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
133  | 
|
| 
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
134  | 
case (Nil, (command, _) #:: more_commands) =>  | 
| 
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
135  | 
if (has_overlay(command)) visible_overlay += command  | 
| 
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
136  | 
|
| 
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
137  | 
check_ranges(Nil, more_commands)  | 
| 
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
138  | 
|
| 44388 | 139  | 
case _ =>  | 
140  | 
}  | 
|
141  | 
}  | 
|
| 
52861
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
142  | 
|
| 
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
143  | 
val commands =  | 
| 
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
144  | 
if (overlays.is_empty) node.command_range(perspective.range)  | 
| 
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
145  | 
else node.command_range()  | 
| 
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
146  | 
check_ranges(perspective.ranges, commands.toStream)  | 
| 
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
147  | 
(Command.Perspective(visible.toList), Command.Perspective(visible_overlay.toList))  | 
| 44388 | 148  | 
}  | 
149  | 
}  | 
|
150  | 
||
151  | 
||
152  | 
||
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
153  | 
/** header edits: structure and outer syntax **/  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
154  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
155  | 
private def header_edits(  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
156  | 
base_syntax: Outer_Syntax,  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
157  | 
previous: Document.Version,  | 
| 
55134
 
1b67b17cdad5
propagate update of outer syntax keywords: global propertiesChanged, buffer TokenMarker.markTokens, text area repainting;
 
wenzelm 
parents: 
55118 
diff
changeset
 | 
158  | 
edits: List[Document.Edit_Text]):  | 
| 
 
1b67b17cdad5
propagate update of outer syntax keywords: global propertiesChanged, buffer TokenMarker.markTokens, text area repainting;
 
wenzelm 
parents: 
55118 
diff
changeset
 | 
159  | 
((Outer_Syntax, Boolean), 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
 | 
160  | 
  {
 | 
| 
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
 | 
161  | 
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
 | 
162  | 
var updated_keywords = false  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
163  | 
var nodes = previous.nodes  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
164  | 
val doc_edits = new mutable.ListBuffer[Document.Edit_Command]  | 
| 
 
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  | 
    edits foreach {
 | 
| 
48707
 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 
wenzelm 
parents: 
48706 
diff
changeset
 | 
167  | 
case (name, Document.Node.Deps(header)) =>  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
168  | 
val node = nodes(name)  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
169  | 
val update_header =  | 
| 
48707
 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 
wenzelm 
parents: 
48706 
diff
changeset
 | 
170  | 
!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
 | 
171  | 
        if (update_header) {
 | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
172  | 
val node1 = node.update_header(header)  | 
| 
48707
 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 
wenzelm 
parents: 
48706 
diff
changeset
 | 
173  | 
updated_imports = updated_imports || (node.header.imports != node1.header.imports)  | 
| 
 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 
wenzelm 
parents: 
48706 
diff
changeset
 | 
174  | 
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
 | 
175  | 
nodes += (name -> node1)  | 
| 
48707
 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 
wenzelm 
parents: 
48706 
diff
changeset
 | 
176  | 
doc_edits += (name -> Document.Node.Deps(header))  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
177  | 
}  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
178  | 
case _ =>  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
179  | 
}  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
180  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
181  | 
val syntax =  | 
| 
55134
 
1b67b17cdad5
propagate update of outer syntax keywords: global propertiesChanged, buffer TokenMarker.markTokens, text area repainting;
 
wenzelm 
parents: 
55118 
diff
changeset
 | 
182  | 
      if (previous.is_init || updated_keywords) {
 | 
| 
 
1b67b17cdad5
propagate update of outer syntax keywords: global propertiesChanged, buffer TokenMarker.markTokens, text area repainting;
 
wenzelm 
parents: 
55118 
diff
changeset
 | 
183  | 
val syntax =  | 
| 
 
1b67b17cdad5
propagate update of outer syntax keywords: global propertiesChanged, buffer TokenMarker.markTokens, text area repainting;
 
wenzelm 
parents: 
55118 
diff
changeset
 | 
184  | 
          (base_syntax /: nodes.entries) {
 | 
| 
 
1b67b17cdad5
propagate update of outer syntax keywords: global propertiesChanged, buffer TokenMarker.markTokens, text area repainting;
 
wenzelm 
parents: 
55118 
diff
changeset
 | 
185  | 
case (syn, (_, node)) => syn.add_keywords(node.header.keywords)  | 
| 
 
1b67b17cdad5
propagate update of outer syntax keywords: global propertiesChanged, buffer TokenMarker.markTokens, text area repainting;
 
wenzelm 
parents: 
55118 
diff
changeset
 | 
186  | 
}  | 
| 
 
1b67b17cdad5
propagate update of outer syntax keywords: global propertiesChanged, buffer TokenMarker.markTokens, text area repainting;
 
wenzelm 
parents: 
55118 
diff
changeset
 | 
187  | 
(syntax, true)  | 
| 
 
1b67b17cdad5
propagate update of outer syntax keywords: global propertiesChanged, buffer TokenMarker.markTokens, text area repainting;
 
wenzelm 
parents: 
55118 
diff
changeset
 | 
188  | 
}  | 
| 
 
1b67b17cdad5
propagate update of outer syntax keywords: global propertiesChanged, buffer TokenMarker.markTokens, text area repainting;
 
wenzelm 
parents: 
55118 
diff
changeset
 | 
189  | 
else (previous.syntax, false)  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
190  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
191  | 
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
 | 
192  | 
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
 | 
193  | 
nodes.descendants(doc_edits.iterator.map(_._1).toList)  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
194  | 
else Nil  | 
| 
 
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  | 
(syntax, reparse, nodes, doc_edits.toList)  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
197  | 
}  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
198  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
199  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
200  | 
|
| 38374 | 201  | 
/** text edits **/  | 
202  | 
||
| 
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
 | 
203  | 
/* edit individual command source */  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
204  | 
|
| 50761 | 205  | 
@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
 | 
206  | 
  {
 | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
207  | 
    eds match {
 | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
208  | 
case e :: es =>  | 
| 
52901
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52887 
diff
changeset
 | 
209  | 
        Document.Node.Commands.starts(commands.iterator).find {
 | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
210  | 
case (cmd, cmd_start) =>  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
211  | 
e.can_edit(cmd.source, cmd_start) ||  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
212  | 
e.is_insert && e.start == cmd_start + cmd.length  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
213  | 
        } match {
 | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
214  | 
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
 | 
215  | 
val (rest, text) = e.edit(cmd.source, cmd_start)  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
216  | 
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
 | 
217  | 
edit_text(rest.toList ::: es, new_commands)  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
218  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
219  | 
case Some((cmd, cmd_start)) =>  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
220  | 
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
 | 
221  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
222  | 
case None =>  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
223  | 
require(e.is_insert && e.start == 0)  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
224  | 
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
 | 
225  | 
}  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
226  | 
case Nil => commands  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
227  | 
}  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
228  | 
}  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
229  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
230  | 
|
| 54513 | 231  | 
/* inlined files */  | 
232  | 
||
233  | 
private def find_file(tokens: List[Token]): Option[String] =  | 
|
234  | 
  {
 | 
|
235  | 
def clean(toks: List[Token]): List[Token] =  | 
|
236  | 
      toks match {
 | 
|
237  | 
case t :: _ :: ts if t.is_keyword && (t.source == "%" || t.source == "--") => clean(ts)  | 
|
238  | 
case t :: ts => t :: clean(ts)  | 
|
239  | 
case Nil => Nil  | 
|
240  | 
}  | 
|
| 
55118
 
7df949045dc5
clarified approximative syntax of thy_load commands: first name after command keyword, after cleaning wrt. tags and cmts;
 
wenzelm 
parents: 
54562 
diff
changeset
 | 
241  | 
    clean(tokens.filter(_.is_proper)) match {
 | 
| 
 
7df949045dc5
clarified approximative syntax of thy_load commands: first name after command keyword, after cleaning wrt. tags and cmts;
 
wenzelm 
parents: 
54562 
diff
changeset
 | 
242  | 
case tok :: toks if tok.is_command => toks.find(_.is_name).map(_.content)  | 
| 
 
7df949045dc5
clarified approximative syntax of thy_load commands: first name after command keyword, after cleaning wrt. tags and cmts;
 
wenzelm 
parents: 
54562 
diff
changeset
 | 
243  | 
case _ => None  | 
| 
 
7df949045dc5
clarified approximative syntax of thy_load commands: first name after command keyword, after cleaning wrt. tags and cmts;
 
wenzelm 
parents: 
54562 
diff
changeset
 | 
244  | 
}  | 
| 54513 | 245  | 
}  | 
246  | 
||
247  | 
def span_files(syntax: Outer_Syntax, span: List[Token]): List[String] =  | 
|
248  | 
    syntax.thy_load(span) match {
 | 
|
249  | 
case Some(exts) =>  | 
|
250  | 
        find_file(span) match {
 | 
|
251  | 
case Some(file) =>  | 
|
252  | 
if (exts.isEmpty) List(file)  | 
|
253  | 
else exts.map(ext => file + "." + ext)  | 
|
254  | 
case None => Nil  | 
|
255  | 
}  | 
|
256  | 
case None => Nil  | 
|
257  | 
}  | 
|
258  | 
||
259  | 
def resolve_files(  | 
|
| 56208 | 260  | 
resources: Resources,  | 
| 54513 | 261  | 
syntax: Outer_Syntax,  | 
| 54517 | 262  | 
node_name: Document.Node.Name,  | 
263  | 
span: List[Token],  | 
|
| 
54521
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
264  | 
doc_blobs: Document.Blobs)  | 
| 
54519
 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 
wenzelm 
parents: 
54518 
diff
changeset
 | 
265  | 
: List[Command.Blob] =  | 
| 54513 | 266  | 
  {
 | 
| 
55431
 
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
 
wenzelm 
parents: 
55134 
diff
changeset
 | 
267  | 
span_files(syntax, span).map(file_name =>  | 
| 54517 | 268  | 
      Exn.capture {
 | 
269  | 
val name =  | 
|
| 56208 | 270  | 
Document.Node.Name(resources.append(node_name.master_dir, Path.explode(file_name)))  | 
| 55783 | 271  | 
val blob = doc_blobs.get(name).map(blob => ((blob.bytes.sha1_digest, blob.file)))  | 
| 
55431
 
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
 
wenzelm 
parents: 
55134 
diff
changeset
 | 
272  | 
(name, blob)  | 
| 55783 | 273  | 
})  | 
| 54513 | 274  | 
}  | 
275  | 
||
276  | 
||
| 
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
 | 
277  | 
/* reparse range of command spans */  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
278  | 
|
| 
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
 | 
279  | 
@tailrec private def chop_common(  | 
| 55779 | 280  | 
cmds: List[Command],  | 
281  | 
blobs_spans: List[(List[Command.Blob], List[Token])])  | 
|
282  | 
: (List[Command], List[(List[Command.Blob], List[Token])]) =  | 
|
283  | 
  {
 | 
|
284  | 
    (cmds, blobs_spans) match {
 | 
|
285  | 
case (cmd :: cmds, (blobs, span) :: rest) if cmd.blobs == blobs && cmd.span == span =>  | 
|
286  | 
chop_common(cmds, rest)  | 
|
287  | 
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
 | 
288  | 
}  | 
| 55779 | 289  | 
}  | 
| 
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
 | 
290  | 
|
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
291  | 
private def reparse_spans(  | 
| 56208 | 292  | 
resources: Resources,  | 
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
293  | 
syntax: Outer_Syntax,  | 
| 
54521
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
294  | 
doc_blobs: Document.Blobs,  | 
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
295  | 
name: Document.Node.Name,  | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
296  | 
commands: Linear_Set[Command],  | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
297  | 
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
 | 
298  | 
  {
 | 
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
299  | 
val cmds0 = commands.iterator(first, last).toList  | 
| 55779 | 300  | 
val blobs_spans0 =  | 
| 54513 | 301  | 
parse_spans(syntax.scan(cmds0.iterator.map(_.source).mkString)).  | 
| 56208 | 302  | 
map(span => (resolve_files(resources, syntax, name, span, doc_blobs), span))  | 
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
303  | 
|
| 55779 | 304  | 
val (cmds1, blobs_spans1) = chop_common(cmds0, blobs_spans0)  | 
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
305  | 
|
| 55779 | 306  | 
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
 | 
307  | 
val cmds2 = rev_cmds2.reverse  | 
| 55779 | 308  | 
val blobs_spans2 = rev_blobs_spans2.reverse  | 
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
309  | 
|
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
310  | 
    cmds2 match {
 | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
311  | 
case Nil =>  | 
| 55779 | 312  | 
assert(blobs_spans2.isEmpty)  | 
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
313  | 
commands  | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
314  | 
case cmd :: _ =>  | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
315  | 
val hook = commands.prev(cmd)  | 
| 54462 | 316  | 
val inserted =  | 
| 55779 | 317  | 
          blobs_spans2.map({ case (blobs, span) => Command(Document_ID.make(), name, blobs, span) })
 | 
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
318  | 
(commands /: cmds2)(_ - _).append_after(hook, inserted)  | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
319  | 
}  | 
| 
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
 | 
320  | 
}  | 
| 
 
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
 | 
321  | 
|
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
322  | 
|
| 
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
 | 
323  | 
/* recover command spans after edits */  | 
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
324  | 
|
| 
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  | 
// FIXME somewhat slow  | 
| 
48746
 
9e1b2aafbc7f
more direct Linear_Set.reverse, swapping orientation of the graph;
 
wenzelm 
parents: 
48718 
diff
changeset
 | 
326  | 
private def recover_spans(  | 
| 56208 | 327  | 
resources: Resources,  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
328  | 
syntax: Outer_Syntax,  | 
| 
54521
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
329  | 
doc_blobs: Document.Blobs,  | 
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
330  | 
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
 | 
331  | 
perspective: Command.Perspective,  | 
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
332  | 
commands: Linear_Set[Command]): Linear_Set[Command] =  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
333  | 
  {
 | 
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
334  | 
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
 | 
335  | 
|
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
336  | 
def next_invisible_command(cmds: Linear_Set[Command], from: Command): Command =  | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
337  | 
cmds.iterator(from).dropWhile(cmd => !cmd.is_command || visible(cmd))  | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
338  | 
.find(_.is_command) getOrElse cmds.last  | 
| 
48746
 
9e1b2aafbc7f
more direct Linear_Set.reverse, swapping orientation of the graph;
 
wenzelm 
parents: 
48718 
diff
changeset
 | 
339  | 
|
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
340  | 
@tailrec def recover(cmds: Linear_Set[Command]): Linear_Set[Command] =  | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
341  | 
      cmds.find(_.is_unparsed) match {
 | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
342  | 
case Some(first_unparsed) =>  | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
343  | 
val first = next_invisible_command(cmds.reverse, first_unparsed)  | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
344  | 
val last = next_invisible_command(cmds, first_unparsed)  | 
| 56208 | 345  | 
recover(reparse_spans(resources, syntax, doc_blobs, name, cmds, first, last))  | 
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
346  | 
case None => cmds  | 
| 
48746
 
9e1b2aafbc7f
more direct Linear_Set.reverse, swapping orientation of the graph;
 
wenzelm 
parents: 
48718 
diff
changeset
 | 
347  | 
}  | 
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
348  | 
recover(commands)  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
349  | 
}  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
350  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
351  | 
|
| 
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
 | 
352  | 
/* consolidate unfinished spans */  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
353  | 
|
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
354  | 
private def consolidate_spans(  | 
| 56208 | 355  | 
resources: Resources,  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
356  | 
syntax: Outer_Syntax,  | 
| 
54521
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
357  | 
doc_blobs: Document.Blobs,  | 
| 
49524
 
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
 
wenzelm 
parents: 
49414 
diff
changeset
 | 
358  | 
reparse_limit: Int,  | 
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
359  | 
name: Document.Node.Name,  | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
360  | 
perspective: Command.Perspective,  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
361  | 
commands: Linear_Set[Command]): Linear_Set[Command] =  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
362  | 
  {
 | 
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
363  | 
if (perspective.commands.isEmpty) commands  | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
364  | 
    else {
 | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
365  | 
      commands.find(_.is_unfinished) match {
 | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
366  | 
case Some(first_unfinished) =>  | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
367  | 
val visible = perspective.commands.toSet  | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
368  | 
          commands.reverse.find(visible) match {
 | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
369  | 
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
 | 
370  | 
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
 | 
371  | 
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
 | 
372  | 
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
 | 
373  | 
              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
 | 
374  | 
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
 | 
375  | 
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
 | 
376  | 
}  | 
| 56208 | 377  | 
reparse_spans(resources, syntax, doc_blobs, name, commands, first_unfinished, last)  | 
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
378  | 
case None => commands  | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
379  | 
}  | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
380  | 
case None => commands  | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
381  | 
}  | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
382  | 
}  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
383  | 
}  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
384  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
385  | 
|
| 
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
 | 
386  | 
/* main */  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
387  | 
|
| 50761 | 388  | 
def diff_commands(old_cmds: Linear_Set[Command], new_cmds: Linear_Set[Command])  | 
| 52849 | 389  | 
: List[Command.Edit] =  | 
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
390  | 
  {
 | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
391  | 
val removed = old_cmds.iterator.filter(!new_cmds.contains(_)).toList  | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
392  | 
val inserted = new_cmds.iterator.filter(!old_cmds.contains(_)).toList  | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
393  | 
|
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
394  | 
removed.reverse.map(cmd => (old_cmds.prev(cmd), None)) :::  | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
395  | 
inserted.map(cmd => (new_cmds.prev(cmd), Some(cmd)))  | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
396  | 
}  | 
| 
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
397  | 
|
| 54513 | 398  | 
private def text_edit(  | 
| 56208 | 399  | 
resources: Resources,  | 
| 54513 | 400  | 
syntax: Outer_Syntax,  | 
| 
54521
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
401  | 
doc_blobs: Document.Blobs,  | 
| 54513 | 402  | 
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
 | 
403  | 
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
 | 
404  | 
  {
 | 
| 
 
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
 | 
405  | 
    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
 | 
406  | 
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
 | 
407  | 
|
| 
55435
 
662e0fd39823
maintain blob edits within history, which is important for Snapshot.convert/revert;
 
wenzelm 
parents: 
55431 
diff
changeset
 | 
408  | 
case (_, Document.Node.Blob()) => node.init_blob  | 
| 
54562
 
301a721af68b
clarified node edits sent to prover -- Clear/Blob only required for text edits within editor;
 
wenzelm 
parents: 
54524 
diff
changeset
 | 
409  | 
|
| 
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
 | 
410  | 
case (name, Document.Node.Edits(text_edits)) =>  | 
| 
55435
 
662e0fd39823
maintain blob edits within history, which is important for Snapshot.convert/revert;
 
wenzelm 
parents: 
55431 
diff
changeset
 | 
411  | 
if (node.is_blob) node  | 
| 
 
662e0fd39823
maintain blob edits within history, which is important for Snapshot.convert/revert;
 
wenzelm 
parents: 
55431 
diff
changeset
 | 
412  | 
        else {
 | 
| 
 
662e0fd39823
maintain blob edits within history, which is important for Snapshot.convert/revert;
 
wenzelm 
parents: 
55431 
diff
changeset
 | 
413  | 
val commands0 = node.commands  | 
| 
 
662e0fd39823
maintain blob edits within history, which is important for Snapshot.convert/revert;
 
wenzelm 
parents: 
55431 
diff
changeset
 | 
414  | 
val commands1 = edit_text(text_edits, commands0)  | 
| 
 
662e0fd39823
maintain blob edits within history, which is important for Snapshot.convert/revert;
 
wenzelm 
parents: 
55431 
diff
changeset
 | 
415  | 
val commands2 =  | 
| 56208 | 416  | 
recover_spans(resources, syntax, doc_blobs, name, node.perspective.visible, commands1)  | 
| 
55435
 
662e0fd39823
maintain blob edits within history, which is important for Snapshot.convert/revert;
 
wenzelm 
parents: 
55431 
diff
changeset
 | 
417  | 
node.update_commands(commands2)  | 
| 
 
662e0fd39823
maintain blob edits within history, which is important for Snapshot.convert/revert;
 
wenzelm 
parents: 
55431 
diff
changeset
 | 
418  | 
}  | 
| 
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
 | 
419  | 
|
| 
 
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
 | 
420  | 
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
 | 
421  | 
|
| 52849 | 422  | 
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
 | 
423  | 
val (visible, visible_overlay) = command_perspective(node, text_perspective, overlays)  | 
| 52849 | 424  | 
val perspective: Document.Node.Perspective_Command =  | 
| 
52861
 
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
 
wenzelm 
parents: 
52849 
diff
changeset
 | 
425  | 
Document.Node.Perspective(required, visible_overlay, overlays)  | 
| 
52808
 
143f225e50f5
allow explicit indication of required node: full eval, no prints;
 
wenzelm 
parents: 
52535 
diff
changeset
 | 
426  | 
if (node.same_perspective(perspective)) 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
 | 
427  | 
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
 | 
428  | 
node.update_perspective(perspective).update_commands(  | 
| 56208 | 429  | 
consolidate_spans(resources, syntax, doc_blobs, reparse_limit,  | 
| 54517 | 430  | 
name, visible, 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
 | 
431  | 
}  | 
| 
 
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
 | 
432  | 
}  | 
| 
 
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
 | 
433  | 
|
| 43722 | 434  | 
def text_edits(  | 
| 56208 | 435  | 
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
 | 
436  | 
reparse_limit: Int,  | 
| 43722 | 437  | 
previous: Document.Version,  | 
| 
54521
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
438  | 
doc_blobs: Document.Blobs,  | 
| 
44157
 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 
wenzelm 
parents: 
44156 
diff
changeset
 | 
439  | 
edits: List[Document.Edit_Text])  | 
| 
55134
 
1b67b17cdad5
propagate update of outer syntax keywords: global propertiesChanged, buffer TokenMarker.markTokens, text area repainting;
 
wenzelm 
parents: 
55118 
diff
changeset
 | 
440  | 
: (Boolean, List[Document.Edit_Command], Document.Version) =  | 
| 38374 | 441  | 
  {
 | 
| 
55134
 
1b67b17cdad5
propagate update of outer syntax keywords: global propertiesChanged, buffer TokenMarker.markTokens, text area repainting;
 
wenzelm 
parents: 
55118 
diff
changeset
 | 
442  | 
val ((syntax, syntax_changed), reparse0, nodes0, doc_edits0) =  | 
| 56208 | 443  | 
header_edits(resources.base_syntax, previous, edits)  | 
| 
54518
 
81a9a54c57fc
always reparse nodes with thy_load commands, to update inlined files;
 
wenzelm 
parents: 
54517 
diff
changeset
 | 
444  | 
|
| 
54521
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
445  | 
if (edits.isEmpty)  | 
| 
55134
 
1b67b17cdad5
propagate update of outer syntax keywords: global propertiesChanged, buffer TokenMarker.markTokens, text area repainting;
 
wenzelm 
parents: 
55118 
diff
changeset
 | 
446  | 
(false, Nil, Document.Version.make(syntax, previous.nodes))  | 
| 
54521
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
447  | 
    else {
 | 
| 
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
448  | 
val reparse =  | 
| 
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
449  | 
        (reparse0 /: nodes0.entries)({
 | 
| 
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
450  | 
case (reparse, (name, node)) =>  | 
| 55785 | 451  | 
if (node.thy_load_commands.exists(_.blobs_changed(doc_blobs)))  | 
452  | 
name :: reparse  | 
|
453  | 
else reparse  | 
|
| 
54521
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
454  | 
})  | 
| 
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
455  | 
val reparse_set = reparse.toSet  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
456  | 
|
| 
54521
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
457  | 
var nodes = nodes0  | 
| 
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
458  | 
val doc_edits = new mutable.ListBuffer[Document.Edit_Command]; doc_edits ++= doc_edits0  | 
| 
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
459  | 
|
| 
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
460  | 
val node_edits =  | 
| 
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
461  | 
(edits ::: reparse.map((_, Document.Node.Edits(Nil)))).groupBy(_._1)  | 
| 
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
462  | 
.asInstanceOf[Map[Document.Node.Name, List[Document.Edit_Text]]] // FIXME ???  | 
| 38374 | 463  | 
|
| 
54521
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
464  | 
      node_edits foreach {
 | 
| 
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
465  | 
case (name, edits) =>  | 
| 
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
466  | 
val node = nodes(name)  | 
| 
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
467  | 
val commands = node.commands  | 
| 
48754
 
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
 
wenzelm 
parents: 
48748 
diff
changeset
 | 
468  | 
|
| 
54521
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
469  | 
val node1 =  | 
| 
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
470  | 
if (reparse_set(name) && !commands.isEmpty)  | 
| 
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
471  | 
node.update_commands(  | 
| 56208 | 472  | 
reparse_spans(resources, syntax, doc_blobs,  | 
| 
54521
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
473  | 
name, commands, commands.head, commands.last))  | 
| 
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
474  | 
else node  | 
| 56208 | 475  | 
val node2 = (node1 /: edits)(text_edit(resources, syntax, doc_blobs, reparse_limit, _, _))  | 
| 
54521
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
476  | 
|
| 
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
477  | 
if (!(node.same_perspective(node2.perspective)))  | 
| 
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
478  | 
doc_edits += (name -> node2.perspective)  | 
| 
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
479  | 
|
| 
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
480  | 
doc_edits += (name -> Document.Node.Edits(diff_commands(commands, node2.commands)))  | 
| 
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
481  | 
|
| 
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
482  | 
nodes += (name -> node2)  | 
| 54513 | 483  | 
}  | 
484  | 
||
| 
55134
 
1b67b17cdad5
propagate update of outer syntax keywords: global propertiesChanged, buffer TokenMarker.markTokens, text area repainting;
 
wenzelm 
parents: 
55118 
diff
changeset
 | 
485  | 
(syntax_changed, doc_edits.toList, Document.Version.make(syntax, nodes))  | 
| 38374 | 486  | 
}  | 
487  | 
}  | 
|
| 34268 | 488  | 
}  |