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