| author | wenzelm |
| Sat, 22 Apr 2023 20:55:05 +0200 | |
| changeset 77907 | ee9785abbcd6 |
| parent 76904 | e27d097d7d15 |
| child 78592 | fdfe9b91d96e |
| permissions | -rw-r--r-- |
|
43282
5d294220ca43
moved sources -- eliminated Netbeans artifact of jedit package directory;
wenzelm
parents:
40851
diff
changeset
|
1 |
/* Title: Tools/jEdit/src/document_model.scala |
| 36760 | 2 |
Author: Fabian Immler, TU Munich |
3 |
Author: Makarius |
|
4 |
||
| 64817 | 5 |
Document model connected to jEdit buffer or external file: content of theory |
6 |
node or auxiliary file (blob). |
|
| 36760 | 7 |
*/ |
| 34407 | 8 |
|
|
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34783
diff
changeset
|
9 |
package isabelle.jedit |
| 34760 | 10 |
|
|
34318
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
11 |
|
| 36015 | 12 |
import isabelle._ |
13 |
||
| 64858 | 14 |
import java.io.{File => JFile}
|
15 |
||
| 34693 | 16 |
import scala.collection.mutable |
| 66019 | 17 |
import scala.annotation.tailrec |
| 34446 | 18 |
|
| 72960 | 19 |
import org.gjt.sp.jedit.View |
|
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34783
diff
changeset
|
20 |
import org.gjt.sp.jedit.Buffer |
| 61192 | 21 |
import org.gjt.sp.jedit.buffer.{BufferAdapter, BufferListener, JEditBuffer}
|
|
34318
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
22 |
|
| 34760 | 23 |
|
| 75393 | 24 |
object Document_Model {
|
| 64817 | 25 |
/* document models */ |
26 |
||
27 |
sealed case class State( |
|
28 |
models: Map[Document.Node.Name, Document_Model] = Map.empty, |
|
|
66101
0f0f294e314f
maintain overlays within main state of document models;
wenzelm
parents:
66082
diff
changeset
|
29 |
buffer_models: Map[JEditBuffer, Buffer_Model] = Map.empty, |
| 75393 | 30 |
overlays: Document.Overlays = Document.Overlays.empty |
31 |
) {
|
|
| 64868 | 32 |
def file_models_iterator: Iterator[(Document.Node.Name, File_Model)] = |
| 64817 | 33 |
for {
|
| 64868 | 34 |
(node_name, model) <- models.iterator |
| 76789 | 35 |
file_model <- Library.as_subclass(classOf[File_Model])(model) |
36 |
} yield (node_name, file_model) |
|
| 64813 | 37 |
|
| 68476 | 38 |
def document_blobs: Document.Blobs = |
39 |
Document.Blobs( |
|
40 |
(for {
|
|
41 |
(node_name, model) <- models.iterator |
|
42 |
blob <- model.get_blob |
|
43 |
} yield (node_name -> blob)).toMap) |
|
44 |
||
| 75393 | 45 |
def open_buffer( |
46 |
session: Session, |
|
47 |
node_name: Document.Node.Name, |
|
48 |
buffer: Buffer |
|
49 |
) : (Buffer_Model, State) = {
|
|
| 64817 | 50 |
val old_model = |
51 |
models.get(node_name) match {
|
|
52 |
case Some(file_model: File_Model) => Some(file_model) |
|
53 |
case Some(buffer_model: Buffer_Model) => Some(buffer_model.exit()) |
|
54 |
case _ => None |
|
55 |
} |
|
|
76790
7a0438979e85
clarified signature: avoid case class with mutable state;
wenzelm
parents:
76789
diff
changeset
|
56 |
val buffer_model = Buffer_Model.init(old_model, session, node_name, buffer) |
| 64817 | 57 |
(buffer_model, |
58 |
copy(models = models + (node_name -> buffer_model), |
|
59 |
buffer_models = buffer_models + (buffer -> buffer_model))) |
|
60 |
} |
|
61 |
||
| 75393 | 62 |
def close_buffer(buffer: JEditBuffer): State = {
|
| 64817 | 63 |
buffer_models.get(buffer) match {
|
64 |
case None => this |
|
65 |
case Some(buffer_model) => |
|
66 |
val file_model = buffer_model.exit() |
|
67 |
copy(models = models + (file_model.node_name -> file_model), |
|
68 |
buffer_models = buffer_models - buffer) |
|
69 |
} |
|
70 |
} |
|
|
64835
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
71 |
|
|
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
72 |
def provide_file(session: Session, node_name: Document.Node.Name, text: String): State = |
|
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
73 |
if (models.isDefinedAt(node_name)) this |
|
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
74 |
else {
|
|
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
75 |
val edit = Text.Edit.insert(0, text) |
| 76783 | 76 |
val content = File_Content(node_name, text) |
77 |
val model = File_Model.init(session, content = content, pending_edits = List(edit)) |
|
|
64835
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
78 |
copy(models = models + (node_name -> model)) |
|
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
79 |
} |
| 64817 | 80 |
} |
|
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34783
diff
changeset
|
81 |
|
| 64817 | 82 |
private val state = Synchronized(State()) // owned by GUI thread |
83 |
||
|
73999
6b213c0115f5
clarified global state: allow to deactivate main plugin;
wenzelm
parents:
73702
diff
changeset
|
84 |
def reset(): Unit = state.change(_ => State()) |
|
6b213c0115f5
clarified global state: allow to deactivate main plugin;
wenzelm
parents:
73702
diff
changeset
|
85 |
|
|
76765
c654103e9c9d
more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents:
76763
diff
changeset
|
86 |
def document_blobs(): Document.Blobs = state.value.document_blobs |
|
c654103e9c9d
more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents:
76763
diff
changeset
|
87 |
|
| 76777 | 88 |
def get_models_map(): Map[Document.Node.Name, Document_Model] = state.value.models |
89 |
def get_models(): Iterable[Document_Model] = get_models_map().values |
|
90 |
def get_model(name: Document.Node.Name): Option[Document_Model] = get_models_map().get(name) |
|
|
76768
40c8275f0131
tuned signature: follow terminology of VSCode_Resources;
wenzelm
parents:
76765
diff
changeset
|
91 |
def get_model(buffer: JEditBuffer): Option[Buffer_Model] = |
|
40c8275f0131
tuned signature: follow terminology of VSCode_Resources;
wenzelm
parents:
76765
diff
changeset
|
92 |
state.value.buffer_models.get(buffer) |
| 64817 | 93 |
|
|
76765
c654103e9c9d
more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents:
76763
diff
changeset
|
94 |
def snapshot(model: Document_Model): Document.Snapshot = |
|
c654103e9c9d
more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents:
76763
diff
changeset
|
95 |
PIDE.session.snapshot( |
|
c654103e9c9d
more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents:
76763
diff
changeset
|
96 |
node_name = model.node_name, |
| 76777 | 97 |
pending_edits = Document.Pending_Edits.make(get_models())) |
|
76765
c654103e9c9d
more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents:
76763
diff
changeset
|
98 |
|
|
76768
40c8275f0131
tuned signature: follow terminology of VSCode_Resources;
wenzelm
parents:
76765
diff
changeset
|
99 |
def get_snapshot(name: Document.Node.Name): Option[Document.Snapshot] = get_model(name).map(snapshot) |
|
40c8275f0131
tuned signature: follow terminology of VSCode_Resources;
wenzelm
parents:
76765
diff
changeset
|
100 |
def get_snapshot(buffer: JEditBuffer): Option[Document.Snapshot] = get_model(buffer).map(snapshot) |
| 68476 | 101 |
|
| 66152 | 102 |
|
|
66101
0f0f294e314f
maintain overlays within main state of document models;
wenzelm
parents:
66082
diff
changeset
|
103 |
/* overlays */ |
|
0f0f294e314f
maintain overlays within main state of document models;
wenzelm
parents:
66082
diff
changeset
|
104 |
|
|
0f0f294e314f
maintain overlays within main state of document models;
wenzelm
parents:
66082
diff
changeset
|
105 |
def node_overlays(name: Document.Node.Name): Document.Node.Overlays = |
|
0f0f294e314f
maintain overlays within main state of document models;
wenzelm
parents:
66082
diff
changeset
|
106 |
state.value.overlays(name) |
|
0f0f294e314f
maintain overlays within main state of document models;
wenzelm
parents:
66082
diff
changeset
|
107 |
|
|
0f0f294e314f
maintain overlays within main state of document models;
wenzelm
parents:
66082
diff
changeset
|
108 |
def insert_overlay(command: Command, fn: String, args: List[String]): Unit = |
|
0f0f294e314f
maintain overlays within main state of document models;
wenzelm
parents:
66082
diff
changeset
|
109 |
state.change(st => st.copy(overlays = st.overlays.insert(command, fn, args))) |
|
0f0f294e314f
maintain overlays within main state of document models;
wenzelm
parents:
66082
diff
changeset
|
110 |
|
|
0f0f294e314f
maintain overlays within main state of document models;
wenzelm
parents:
66082
diff
changeset
|
111 |
def remove_overlay(command: Command, fn: String, args: List[String]): Unit = |
|
0f0f294e314f
maintain overlays within main state of document models;
wenzelm
parents:
66082
diff
changeset
|
112 |
state.change(st => st.copy(overlays = st.overlays.remove(command, fn, args))) |
|
0f0f294e314f
maintain overlays within main state of document models;
wenzelm
parents:
66082
diff
changeset
|
113 |
|
|
0f0f294e314f
maintain overlays within main state of document models;
wenzelm
parents:
66082
diff
changeset
|
114 |
|
| 64858 | 115 |
/* sync external files */ |
116 |
||
| 75393 | 117 |
def sync_files(changed_files: Set[JFile]): Boolean = {
|
| 75394 | 118 |
state.change_result { st =>
|
| 75393 | 119 |
val changed_models = |
120 |
(for {
|
|
121 |
(node_name, model) <- st.file_models_iterator |
|
122 |
file <- model.file if changed_files(file) |
|
123 |
text <- PIDE.resources.read_file_content(node_name) |
|
124 |
if model.content.text != text |
|
125 |
} yield {
|
|
|
76781
d9f48960bf23
clarified signature: more position information via node_name;
wenzelm
parents:
76778
diff
changeset
|
126 |
val content = Document_Model.File_Content(node_name, text) |
| 75393 | 127 |
val edits = Text.Edit.replace(0, model.content.text, text) |
128 |
(node_name, model.copy(content = content, pending_edits = model.pending_edits ::: edits)) |
|
129 |
}).toList |
|
130 |
if (changed_models.isEmpty) (false, st) |
|
131 |
else (true, st.copy(models = changed_models.foldLeft(st.models)(_ + _))) |
|
| 75394 | 132 |
} |
| 64858 | 133 |
} |
134 |
||
135 |
||
| 64836 | 136 |
/* syntax */ |
137 |
||
| 75393 | 138 |
def syntax_changed(names: List[Document.Node.Name]): Unit = {
|
| 64836 | 139 |
GUI_Thread.require {}
|
140 |
||
141 |
val models = state.value.models |
|
142 |
for (name <- names.iterator; model <- models.get(name)) {
|
|
143 |
model match { case buffer_model: Buffer_Model => buffer_model.syntax_changed() case _ => }
|
|
144 |
} |
|
145 |
} |
|
146 |
||
147 |
||
| 64817 | 148 |
/* init and exit */ |
149 |
||
| 75393 | 150 |
def init(session: Session, node_name: Document.Node.Name, buffer: Buffer): Buffer_Model = {
|
| 64817 | 151 |
GUI_Thread.require {}
|
152 |
state.change_result(st => |
|
153 |
st.buffer_models.get(buffer) match {
|
|
154 |
case Some(buffer_model) if buffer_model.node_name == node_name => |
|
| 72960 | 155 |
buffer_model.init_token_marker() |
| 64817 | 156 |
(buffer_model, st) |
157 |
case _ => |
|
158 |
val res = st.close_buffer(buffer).open_buffer(session, node_name, buffer) |
|
| 72960 | 159 |
buffer.propertiesChanged() |
| 64817 | 160 |
res |
161 |
}) |
|
162 |
} |
|
163 |
||
| 75393 | 164 |
def exit(buffer: Buffer): Unit = {
|
|
57612
990ffb84489b
clarified module name: facilitate alternative GUI frameworks;
wenzelm
parents:
57610
diff
changeset
|
165 |
GUI_Thread.require {}
|
| 64813 | 166 |
state.change(st => |
| 64817 | 167 |
if (st.buffer_models.isDefinedAt(buffer)) {
|
168 |
val res = st.close_buffer(buffer) |
|
| 72960 | 169 |
buffer.propertiesChanged() |
| 64817 | 170 |
res |
171 |
} |
|
172 |
else st) |
|
173 |
} |
|
174 |
||
| 75393 | 175 |
def provide_files(session: Session, files: List[(Document.Node.Name, String)]): Unit = {
|
|
64835
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
176 |
GUI_Thread.require {}
|
|
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
177 |
state.change(st => |
| 73358 | 178 |
files.foldLeft(st) {
|
179 |
case (st1, (node_name, text)) => st1.provide_file(session, node_name, text) |
|
180 |
}) |
|
|
64835
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
181 |
} |
|
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
182 |
|
| 64817 | 183 |
|
184 |
/* required nodes */ |
|
185 |
||
|
76715
bf5ff407f32f
clarified state of document model vs. document editor selection (again, see also a9d52d02bd83);
wenzelm
parents:
76706
diff
changeset
|
186 |
def nodes_required(): Set[Document.Node.Name] = |
| 64817 | 187 |
(for {
|
| 64868 | 188 |
(node_name, model) <- state.value.models.iterator |
|
76715
bf5ff407f32f
clarified state of document model vs. document editor selection (again, see also a9d52d02bd83);
wenzelm
parents:
76706
diff
changeset
|
189 |
if model.node_required |
| 64868 | 190 |
} yield node_name).toSet |
| 64817 | 191 |
|
| 73340 | 192 |
def node_required( |
| 75393 | 193 |
name: Document.Node.Name, |
194 |
toggle: Boolean = false, |
|
195 |
set: Boolean = false |
|
196 |
) : Unit = {
|
|
| 64817 | 197 |
GUI_Thread.require {}
|
198 |
||
199 |
val changed = |
|
200 |
state.change_result(st => |
|
201 |
st.models.get(name) match {
|
|
202 |
case None => (false, st) |
|
203 |
case Some(model) => |
|
|
76715
bf5ff407f32f
clarified state of document model vs. document editor selection (again, see also a9d52d02bd83);
wenzelm
parents:
76706
diff
changeset
|
204 |
val a = model.node_required |
|
76481
a9d52d02bd83
clarified node_required status: distinguish theory_required vs. document_required;
wenzelm
parents:
75979
diff
changeset
|
205 |
val b = if (toggle) !a else set |
| 64817 | 206 |
model match {
|
|
76481
a9d52d02bd83
clarified node_required status: distinguish theory_required vs. document_required;
wenzelm
parents:
75979
diff
changeset
|
207 |
case m: File_Model if a != b => |
|
76715
bf5ff407f32f
clarified state of document model vs. document editor selection (again, see also a9d52d02bd83);
wenzelm
parents:
76706
diff
changeset
|
208 |
(true, st.copy(models = st.models + (name -> m.set_node_required(b)))) |
|
76481
a9d52d02bd83
clarified node_required status: distinguish theory_required vs. document_required;
wenzelm
parents:
75979
diff
changeset
|
209 |
case m: Buffer_Model if a != b => |
|
76715
bf5ff407f32f
clarified state of document model vs. document editor selection (again, see also a9d52d02bd83);
wenzelm
parents:
76706
diff
changeset
|
210 |
m.set_node_required(b); (true, st) |
| 64817 | 211 |
case _ => (false, st) |
212 |
} |
|
213 |
}) |
|
| 76706 | 214 |
if (changed) PIDE.editor.state_changed() |
| 64817 | 215 |
} |
216 |
||
|
76481
a9d52d02bd83
clarified node_required status: distinguish theory_required vs. document_required;
wenzelm
parents:
75979
diff
changeset
|
217 |
def view_node_required( |
|
a9d52d02bd83
clarified node_required status: distinguish theory_required vs. document_required;
wenzelm
parents:
75979
diff
changeset
|
218 |
view: View, |
|
a9d52d02bd83
clarified node_required status: distinguish theory_required vs. document_required;
wenzelm
parents:
75979
diff
changeset
|
219 |
toggle: Boolean = false, |
|
a9d52d02bd83
clarified node_required status: distinguish theory_required vs. document_required;
wenzelm
parents:
75979
diff
changeset
|
220 |
set: Boolean = false |
|
a9d52d02bd83
clarified node_required status: distinguish theory_required vs. document_required;
wenzelm
parents:
75979
diff
changeset
|
221 |
): Unit = |
|
76768
40c8275f0131
tuned signature: follow terminology of VSCode_Resources;
wenzelm
parents:
76765
diff
changeset
|
222 |
Document_Model.get_model(view.getBuffer).foreach(model => |
|
76715
bf5ff407f32f
clarified state of document model vs. document editor selection (again, see also a9d52d02bd83);
wenzelm
parents:
76706
diff
changeset
|
223 |
node_required(model.node_name, toggle = toggle, set = set)) |
| 64817 | 224 |
|
225 |
||
226 |
/* flushed edits */ |
|
227 |
||
| 75393 | 228 |
def flush_edits(hidden: Boolean, purge: Boolean): (Document.Blobs, List[Document.Edit_Text]) = {
|
| 64817 | 229 |
GUI_Thread.require {}
|
230 |
||
| 75394 | 231 |
state.change_result { st =>
|
| 75393 | 232 |
val doc_blobs = st.document_blobs |
| 64817 | 233 |
|
| 75393 | 234 |
val buffer_edits = |
235 |
(for {
|
|
236 |
(_, model) <- st.buffer_models.iterator |
|
237 |
edit <- model.flush_edits(doc_blobs, hidden).iterator |
|
238 |
} yield edit).toList |
|
| 64817 | 239 |
|
| 75393 | 240 |
val file_edits = |
241 |
(for {
|
|
242 |
(node_name, model) <- st.file_models_iterator |
|
243 |
(edits, model1) <- model.flush_edits(doc_blobs, hidden) |
|
244 |
} yield (edits, node_name -> model1)).toList |
|
| 64867 | 245 |
|
| 75393 | 246 |
val model_edits = buffer_edits ::: file_edits.flatMap(_._1) |
| 64867 | 247 |
|
| 75393 | 248 |
val purge_edits = |
249 |
if (purge) {
|
|
250 |
val purged = |
|
251 |
(for ((node_name, model) <- st.file_models_iterator) |
|
252 |
yield (node_name -> model.purge_edits(doc_blobs))).toList |
|
| 64817 | 253 |
|
| 75393 | 254 |
val imports = {
|
255 |
val open_nodes = |
|
256 |
(for ((_, model) <- st.buffer_models.iterator) yield model.node_name).toList |
|
257 |
val touched_nodes = model_edits.map(_._1) |
|
258 |
val pending_nodes = for ((node_name, None) <- purged) yield node_name |
|
259 |
(open_nodes ::: touched_nodes ::: pending_nodes).map((_, Position.none)) |
|
260 |
} |
|
261 |
val retain = PIDE.resources.dependencies(imports).theories.toSet |
|
| 64817 | 262 |
|
| 75393 | 263 |
for ((node_name, Some(edits)) <- purged if !retain(node_name); edit <- edits) |
264 |
yield edit |
|
265 |
} |
|
266 |
else Nil |
|
| 64867 | 267 |
|
| 75393 | 268 |
val st1 = st.copy(models = st.models ++ file_edits.map(_._2) -- purge_edits.map(_._1)) |
269 |
PIDE.plugin.file_watcher.purge( |
|
270 |
(for {
|
|
271 |
(_, model) <- st1.file_models_iterator |
|
272 |
file <- model.file |
|
273 |
} yield file.getParentFile).toSet) |
|
| 64867 | 274 |
|
| 75393 | 275 |
((doc_blobs, model_edits ::: purge_edits), st1) |
| 75394 | 276 |
} |
|
34318
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
277 |
} |
| 43397 | 278 |
|
| 64817 | 279 |
|
280 |
/* file content */ |
|
281 |
||
|
76781
d9f48960bf23
clarified signature: more position information via node_name;
wenzelm
parents:
76778
diff
changeset
|
282 |
object File_Content {
|
|
d9f48960bf23
clarified signature: more position information via node_name;
wenzelm
parents:
76778
diff
changeset
|
283 |
val empty: File_Content = apply(Document.Node.Name.empty, "") |
|
d9f48960bf23
clarified signature: more position information via node_name;
wenzelm
parents:
76778
diff
changeset
|
284 |
|
|
d9f48960bf23
clarified signature: more position information via node_name;
wenzelm
parents:
76778
diff
changeset
|
285 |
def apply(node_name: Document.Node.Name, text: String): File_Content = |
|
d9f48960bf23
clarified signature: more position information via node_name;
wenzelm
parents:
76778
diff
changeset
|
286 |
new File_Content(node_name, text) |
|
d9f48960bf23
clarified signature: more position information via node_name;
wenzelm
parents:
76778
diff
changeset
|
287 |
} |
|
d9f48960bf23
clarified signature: more position information via node_name;
wenzelm
parents:
76778
diff
changeset
|
288 |
|
|
d9f48960bf23
clarified signature: more position information via node_name;
wenzelm
parents:
76778
diff
changeset
|
289 |
final class File_Content private(val node_name: Document.Node.Name, val text: String) {
|
|
d9f48960bf23
clarified signature: more position information via node_name;
wenzelm
parents:
76778
diff
changeset
|
290 |
override def toString: String = "Document_Model.File_Content(" + node_name.node + ")"
|
|
64835
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
291 |
lazy val bytes: Bytes = Bytes(Symbol.encode(text)) |
| 64817 | 292 |
lazy val chunk: Symbol.Text_Chunk = Symbol.Text_Chunk(text) |
|
76792
23f433294173
support for generic File_Format.parse_data, with persistent result in document model;
wenzelm
parents:
76791
diff
changeset
|
293 |
lazy val data: AnyRef = File_Format.registry.parse_data(node_name, text) |
| 64817 | 294 |
} |
| 66019 | 295 |
|
296 |
||
297 |
/* HTTP preview */ |
|
298 |
||
| 75393 | 299 |
def open_preview(view: View, plain_text: Boolean): Unit = {
|
|
76768
40c8275f0131
tuned signature: follow terminology of VSCode_Resources;
wenzelm
parents:
76765
diff
changeset
|
300 |
Document_Model.get_model(view.getBuffer) match {
|
|
67246
4cedf44f2af1
isabelle.preview presents auxiliary text files as well;
wenzelm
parents:
67244
diff
changeset
|
301 |
case Some(model) => |
| 75148 | 302 |
val url = Preview_Service.server_url(plain_text, model.node_name) |
|
67246
4cedf44f2af1
isabelle.preview presents auxiliary text files as well;
wenzelm
parents:
67244
diff
changeset
|
303 |
PIDE.editor.hyperlink_url(url).follow(view) |
| 66036 | 304 |
case _ => |
| 66019 | 305 |
} |
306 |
} |
|
307 |
||
| 75393 | 308 |
object Preview_Service extends HTTP.Service("preview") {
|
| 75148 | 309 |
service => |
310 |
||
311 |
private val plain_text_prefix = "plain_text=" |
|
312 |
||
313 |
def server_url(plain_text: Boolean, node_name: Document.Node.Name): String = |
|
314 |
PIDE.plugin.http_server.url + "/" + service.name + "?" + |
|
315 |
(if (plain_text) plain_text_prefix else "") + Url.encode(node_name.node) |
|
316 |
||
|
76830
5ab016cbba18
proper thread context (amending 01a7265db76b) -- at the danger of blocking the GUI;
wenzelm
parents:
76794
diff
changeset
|
317 |
def apply(request: HTTP.Request): Option[HTTP.Response] = GUI_Thread.now {
|
| 75107 | 318 |
for {
|
| 75112 | 319 |
query <- request.decode_query |
| 75107 | 320 |
name = Library.perhaps_unprefix(plain_text_prefix, query) |
|
76768
40c8275f0131
tuned signature: follow terminology of VSCode_Resources;
wenzelm
parents:
76765
diff
changeset
|
321 |
model <- get_model(PIDE.resources.node_name(name)) |
| 75107 | 322 |
} |
323 |
yield {
|
|
324 |
val snapshot = model.await_stable_snapshot() |
|
| 75979 | 325 |
val context = |
326 |
Browser_Info.context(PIDE.resources.sessions_structure, |
|
327 |
elements = Browser_Info.extra_elements) |
|
| 75107 | 328 |
val document = |
| 75979 | 329 |
context.preview_document(snapshot, |
| 75107 | 330 |
plain_text = query.startsWith(plain_text_prefix), |
| 75146 | 331 |
fonts_css = HTML.fonts_css_dir(HTTP.url_path(request.server_name))) |
| 75107 | 332 |
HTTP.Response.html(document.content) |
| 75113 | 333 |
} |
|
76830
5ab016cbba18
proper thread context (amending 01a7265db76b) -- at the danger of blocking the GUI;
wenzelm
parents:
76794
diff
changeset
|
334 |
} |
| 75113 | 335 |
} |
| 64817 | 336 |
} |
337 |
||
| 75393 | 338 |
sealed abstract class Document_Model extends Document.Model {
|
|
76765
c654103e9c9d
more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents:
76763
diff
changeset
|
339 |
model => |
|
c654103e9c9d
more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents:
76763
diff
changeset
|
340 |
|
|
c654103e9c9d
more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents:
76763
diff
changeset
|
341 |
|
| 64817 | 342 |
/* perspective */ |
343 |
||
344 |
def document_view_ranges(snapshot: Document.Snapshot): List[Text.Range] = Nil |
|
345 |
||
346 |
def node_perspective( |
|
| 75393 | 347 |
doc_blobs: Document.Blobs, |
348 |
hidden: Boolean |
|
| 76702 | 349 |
): (Boolean, Document.Node.Perspective_Text.T) = {
|
|
57612
990ffb84489b
clarified module name: facilitate alternative GUI frameworks;
wenzelm
parents:
57610
diff
changeset
|
350 |
GUI_Thread.require {}
|
| 64817 | 351 |
|
| 75849 | 352 |
if (JEdit_Options.continuous_checking() && is_theory) {
|
|
76765
c654103e9c9d
more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents:
76763
diff
changeset
|
353 |
val snapshot = Document_Model.snapshot(model) |
| 64817 | 354 |
|
|
76715
bf5ff407f32f
clarified state of document model vs. document editor selection (again, see also a9d52d02bd83);
wenzelm
parents:
76706
diff
changeset
|
355 |
val required = node_required || PIDE.editor.document_node_required(node_name) |
|
bf5ff407f32f
clarified state of document model vs. document editor selection (again, see also a9d52d02bd83);
wenzelm
parents:
76706
diff
changeset
|
356 |
|
| 64817 | 357 |
val reparse = snapshot.node.load_commands_changed(doc_blobs) |
358 |
val perspective = |
|
359 |
if (hidden) Text.Perspective.empty |
|
360 |
else {
|
|
361 |
val view_ranges = document_view_ranges(snapshot) |
|
| 71601 | 362 |
val load_ranges = snapshot.commands_loading_ranges(PIDE.editor.visible_node) |
| 64817 | 363 |
Text.Perspective(view_ranges ::: load_ranges) |
364 |
} |
|
| 66082 | 365 |
val overlays = PIDE.editor.node_overlays(node_name) |
| 64817 | 366 |
|
|
76715
bf5ff407f32f
clarified state of document model vs. document editor selection (again, see also a9d52d02bd83);
wenzelm
parents:
76706
diff
changeset
|
367 |
(reparse, Document.Node.Perspective(required, perspective, overlays)) |
| 64817 | 368 |
} |
| 76702 | 369 |
else (false, Document.Node.Perspective_Text.empty) |
| 43397 | 370 |
} |
| 66019 | 371 |
|
372 |
||
373 |
/* snapshot */ |
|
374 |
||
| 75393 | 375 |
@tailrec final def await_stable_snapshot(): Document.Snapshot = {
|
|
76765
c654103e9c9d
more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents:
76763
diff
changeset
|
376 |
val snapshot = Document_Model.snapshot(model) |
| 66019 | 377 |
if (snapshot.is_outdated) {
|
| 76610 | 378 |
PIDE.session.output_delay.sleep() |
| 66019 | 379 |
await_stable_snapshot() |
380 |
} |
|
381 |
else snapshot |
|
382 |
} |
|
|
34318
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
383 |
} |
|
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
384 |
|
| 75393 | 385 |
object File_Model {
|
| 64863 | 386 |
def init(session: Session, |
| 76783 | 387 |
content: Document_Model.File_Content = Document_Model.File_Content.empty, |
|
76715
bf5ff407f32f
clarified state of document model vs. document editor selection (again, see also a9d52d02bd83);
wenzelm
parents:
76706
diff
changeset
|
388 |
node_required: Boolean = false, |
| 76702 | 389 |
last_perspective: Document.Node.Perspective_Text.T = Document.Node.Perspective_Text.empty, |
| 75393 | 390 |
pending_edits: List[Text.Edit] = Nil |
391 |
): File_Model = {
|
|
| 76783 | 392 |
val node_name = content.node_name |
393 |
||
| 65469 | 394 |
val file = JEdit_Lib.check_file(node_name.node) |
| 65245 | 395 |
file.foreach(PIDE.plugin.file_watcher.register_parent(_)) |
| 64863 | 396 |
|
|
76715
bf5ff407f32f
clarified state of document model vs. document editor selection (again, see also a9d52d02bd83);
wenzelm
parents:
76706
diff
changeset
|
397 |
val node_required1 = node_required || File_Format.registry.is_theory(node_name) |
|
76781
d9f48960bf23
clarified signature: more position information via node_name;
wenzelm
parents:
76778
diff
changeset
|
398 |
File_Model(session, file, content, node_required1, last_perspective, pending_edits) |
| 64863 | 399 |
} |
400 |
} |
|
401 |
||
| 64817 | 402 |
case class File_Model( |
403 |
session: Session, |
|
|
64864
eec7ffef0be6
accomodate very big file_models and changed_files;
wenzelm
parents:
64863
diff
changeset
|
404 |
file: Option[JFile], |
| 64817 | 405 |
content: Document_Model.File_Content, |
|
76715
bf5ff407f32f
clarified state of document model vs. document editor selection (again, see also a9d52d02bd83);
wenzelm
parents:
76706
diff
changeset
|
406 |
node_required: Boolean, |
| 76702 | 407 |
last_perspective: Document.Node.Perspective_Text.T, |
| 75393 | 408 |
pending_edits: List[Text.Edit] |
409 |
) extends Document_Model {
|
|
|
76781
d9f48960bf23
clarified signature: more position information via node_name;
wenzelm
parents:
76778
diff
changeset
|
410 |
/* content */ |
|
d9f48960bf23
clarified signature: more position information via node_name;
wenzelm
parents:
76778
diff
changeset
|
411 |
|
|
d9f48960bf23
clarified signature: more position information via node_name;
wenzelm
parents:
76778
diff
changeset
|
412 |
def node_name: Document.Node.Name = content.node_name |
|
d9f48960bf23
clarified signature: more position information via node_name;
wenzelm
parents:
76778
diff
changeset
|
413 |
|
|
d9f48960bf23
clarified signature: more position information via node_name;
wenzelm
parents:
76778
diff
changeset
|
414 |
def get_text(range: Text.Range): Option[String] = |
|
d9f48960bf23
clarified signature: more position information via node_name;
wenzelm
parents:
76778
diff
changeset
|
415 |
range.try_substring(content.text) |
|
d9f48960bf23
clarified signature: more position information via node_name;
wenzelm
parents:
76778
diff
changeset
|
416 |
|
|
d9f48960bf23
clarified signature: more position information via node_name;
wenzelm
parents:
76778
diff
changeset
|
417 |
|
|
76481
a9d52d02bd83
clarified node_required status: distinguish theory_required vs. document_required;
wenzelm
parents:
75979
diff
changeset
|
418 |
/* required */ |
|
a9d52d02bd83
clarified node_required status: distinguish theory_required vs. document_required;
wenzelm
parents:
75979
diff
changeset
|
419 |
|
|
76715
bf5ff407f32f
clarified state of document model vs. document editor selection (again, see also a9d52d02bd83);
wenzelm
parents:
76706
diff
changeset
|
420 |
def set_node_required(b: Boolean): File_Model = copy(node_required = b) |
|
76481
a9d52d02bd83
clarified node_required status: distinguish theory_required vs. document_required;
wenzelm
parents:
75979
diff
changeset
|
421 |
|
|
a9d52d02bd83
clarified node_required status: distinguish theory_required vs. document_required;
wenzelm
parents:
75979
diff
changeset
|
422 |
|
| 64817 | 423 |
/* header */ |
424 |
||
425 |
def node_header: Document.Node.Header = |
|
426 |
PIDE.resources.special_header(node_name) getOrElse |
|
| 72772 | 427 |
PIDE.resources.check_thy(node_name, Scan.char_reader(content.text), strict = false) |
| 64817 | 428 |
|
429 |
||
430 |
/* content */ |
|
431 |
||
|
64829
07f209e957bc
refer to bibtex entries via general Document_Model, instead of editor buffers;
wenzelm
parents:
64828
diff
changeset
|
432 |
def node_position(offset: Text.Offset): Line.Node_Position = |
|
07f209e957bc
refer to bibtex entries via general Document_Model, instead of editor buffers;
wenzelm
parents:
64828
diff
changeset
|
433 |
Line.Node_Position(node_name.node, |
|
65196
e8760a98db78
discontinued pointless Text.Length: Javascript and Java agree in old-fashioned UTF-16;
wenzelm
parents:
65132
diff
changeset
|
434 |
Line.Position.zero.advance(content.text.substring(0, offset))) |
|
64829
07f209e957bc
refer to bibtex entries via general Document_Model, instead of editor buffers;
wenzelm
parents:
64828
diff
changeset
|
435 |
|
|
76904
e27d097d7d15
tuned signature: avoid confusion with Document.Node.Blob and Command.Blob;
wenzelm
parents:
76830
diff
changeset
|
436 |
def get_blob: Option[Document.Blobs.Item] = |
| 64817 | 437 |
if (is_theory) None |
|
76904
e27d097d7d15
tuned signature: avoid confusion with Document.Node.Blob and Command.Blob;
wenzelm
parents:
76830
diff
changeset
|
438 |
else Some(Document.Blobs.Item(content.bytes, content.text, content.chunk, pending_edits.nonEmpty)) |
| 64817 | 439 |
|
|
76792
23f433294173
support for generic File_Format.parse_data, with persistent result in document model;
wenzelm
parents:
76791
diff
changeset
|
440 |
def untyped_data: AnyRef = content.data |
| 64680 | 441 |
|
442 |
||
| 64817 | 443 |
/* edits */ |
444 |
||
445 |
def update_text(text: String): Option[File_Model] = |
|
446 |
Text.Edit.replace(0, content.text, text) match {
|
|
447 |
case Nil => None |
|
448 |
case edits => |
|
|
76781
d9f48960bf23
clarified signature: more position information via node_name;
wenzelm
parents:
76778
diff
changeset
|
449 |
val content1 = Document_Model.File_Content(node_name, text) |
| 64817 | 450 |
val pending_edits1 = pending_edits ::: edits |
451 |
Some(copy(content = content1, pending_edits = pending_edits1)) |
|
452 |
} |
|
|
38222
dac5fa0ac971
replaced individual Document_Model history by all-inclusive one in Session;
wenzelm
parents:
38158
diff
changeset
|
453 |
|
| 75393 | 454 |
def flush_edits( |
455 |
doc_blobs: Document.Blobs, |
|
456 |
hidden: Boolean |
|
| 76607 | 457 |
): Option[(List[Document.Edit_Text], File_Model)] = {
|
| 64817 | 458 |
val (reparse, perspective) = node_perspective(doc_blobs, hidden) |
459 |
if (reparse || pending_edits.nonEmpty || last_perspective != perspective) {
|
|
| 64867 | 460 |
val edits = node_edits(node_header, pending_edits, perspective) |
| 64817 | 461 |
Some((edits, copy(last_perspective = perspective, pending_edits = Nil))) |
462 |
} |
|
463 |
else None |
|
464 |
} |
|
465 |
||
| 64867 | 466 |
def purge_edits(doc_blobs: Document.Blobs): Option[List[Document.Edit_Text]] = |
| 67310 | 467 |
if (pending_edits.nonEmpty || |
| 71733 | 468 |
!File_Format.registry.is_theory(node_name) && |
| 76702 | 469 |
(node_required || !Document.Node.Perspective_Text.is_empty(last_perspective))) None |
| 64867 | 470 |
else {
|
471 |
val text_edits = List(Text.Edit.remove(0, content.text)) |
|
| 76702 | 472 |
Some(node_edits(Document.Node.no_header, text_edits, Document.Node.Perspective_Text.empty)) |
| 64867 | 473 |
} |
474 |
||
| 64817 | 475 |
def is_stable: Boolean = pending_edits.isEmpty |
476 |
} |
|
477 |
||
|
76790
7a0438979e85
clarified signature: avoid case class with mutable state;
wenzelm
parents:
76789
diff
changeset
|
478 |
object Buffer_Model {
|
|
7a0438979e85
clarified signature: avoid case class with mutable state;
wenzelm
parents:
76789
diff
changeset
|
479 |
def init( |
|
7a0438979e85
clarified signature: avoid case class with mutable state;
wenzelm
parents:
76789
diff
changeset
|
480 |
old_model: Option[File_Model], |
|
7a0438979e85
clarified signature: avoid case class with mutable state;
wenzelm
parents:
76789
diff
changeset
|
481 |
session: Session, |
|
7a0438979e85
clarified signature: avoid case class with mutable state;
wenzelm
parents:
76789
diff
changeset
|
482 |
node_name: Document.Node.Name, |
|
7a0438979e85
clarified signature: avoid case class with mutable state;
wenzelm
parents:
76789
diff
changeset
|
483 |
buffer: Buffer |
|
7a0438979e85
clarified signature: avoid case class with mutable state;
wenzelm
parents:
76789
diff
changeset
|
484 |
): Buffer_Model = (new Buffer_Model(session, node_name, buffer)).init(old_model) |
|
7a0438979e85
clarified signature: avoid case class with mutable state;
wenzelm
parents:
76789
diff
changeset
|
485 |
} |
|
7a0438979e85
clarified signature: avoid case class with mutable state;
wenzelm
parents:
76789
diff
changeset
|
486 |
|
|
7a0438979e85
clarified signature: avoid case class with mutable state;
wenzelm
parents:
76789
diff
changeset
|
487 |
class Buffer_Model private( |
|
7a0438979e85
clarified signature: avoid case class with mutable state;
wenzelm
parents:
76789
diff
changeset
|
488 |
val session: Session, |
|
7a0438979e85
clarified signature: avoid case class with mutable state;
wenzelm
parents:
76789
diff
changeset
|
489 |
val node_name: Document.Node.Name, |
|
7a0438979e85
clarified signature: avoid case class with mutable state;
wenzelm
parents:
76789
diff
changeset
|
490 |
val buffer: Buffer |
|
7a0438979e85
clarified signature: avoid case class with mutable state;
wenzelm
parents:
76789
diff
changeset
|
491 |
) extends Document_Model {
|
| 66114 | 492 |
/* text */ |
493 |
||
| 67014 | 494 |
def get_text(range: Text.Range): Option[String] = |
495 |
JEdit_Lib.get_text(buffer, range) |
|
| 66114 | 496 |
|
497 |
||
| 64817 | 498 |
/* header */ |
|
54509
1f77110c94ef
maintain document model for all files, with document view for theory only, and special blob for non-theory files;
wenzelm
parents:
54464
diff
changeset
|
499 |
|
| 75393 | 500 |
def node_header(): Document.Node.Header = {
|
|
57612
990ffb84489b
clarified module name: facilitate alternative GUI frameworks;
wenzelm
parents:
57610
diff
changeset
|
501 |
GUI_Thread.require {}
|
|
54509
1f77110c94ef
maintain document model for all files, with document view for theory only, and special blob for non-theory files;
wenzelm
parents:
54464
diff
changeset
|
502 |
|
|
64673
b5965890e54d
more uniform treatment of file name vs. theory name and special header;
wenzelm
parents:
63446
diff
changeset
|
503 |
PIDE.resources.special_header(node_name) getOrElse |
|
64826
c97296294f6d
clarified check_thy_reader: check node_name here;
wenzelm
parents:
64825
diff
changeset
|
504 |
JEdit_Lib.buffer_lock(buffer) {
|
| 72772 | 505 |
PIDE.resources.check_thy(node_name, JEdit_Lib.buffer_reader(buffer), strict = false) |
|
46748
8f3ae4d04a2d
refined node_header -- more direct buffer access (again);
wenzelm
parents:
46740
diff
changeset
|
506 |
} |
|
46920
5f44c8bea84e
more explicit indication of swing thread context;
wenzelm
parents:
46750
diff
changeset
|
507 |
} |
|
44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44379
diff
changeset
|
508 |
|
|
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44379
diff
changeset
|
509 |
|
|
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44379
diff
changeset
|
510 |
/* perspective */ |
|
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44379
diff
changeset
|
511 |
|
| 64883 | 512 |
def document_view_iterator: Iterator[Document_View] = |
513 |
for {
|
|
514 |
text_area <- JEdit_Lib.jedit_text_areas(buffer) |
|
515 |
doc_view <- Document_View.get(text_area) |
|
516 |
} yield doc_view |
|
517 |
||
| 75393 | 518 |
override def document_view_ranges(snapshot: Document.Snapshot): List[Text.Range] = {
|
|
57612
990ffb84489b
clarified module name: facilitate alternative GUI frameworks;
wenzelm
parents:
57610
diff
changeset
|
519 |
GUI_Thread.require {}
|
|
52759
a20631db9c8a
support declarative editor_execution_range, instead of old-style check/cancel buttons;
wenzelm
parents:
50565
diff
changeset
|
520 |
|
| 64817 | 521 |
(for {
|
| 64883 | 522 |
doc_view <- document_view_iterator |
| 64817 | 523 |
range <- doc_view.perspective(snapshot).ranges.iterator |
524 |
} yield range).toList |
|
|
44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44379
diff
changeset
|
525 |
} |
|
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44379
diff
changeset
|
526 |
|
|
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44379
diff
changeset
|
527 |
|
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
528 |
/* mutable buffer state: owned by GUI thread */ |
| 54511 | 529 |
|
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
530 |
private object buffer_state {
|
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
531 |
// perspective and edits |
| 58543 | 532 |
|
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
533 |
private var last_perspective = Document.Node.Perspective_Text.empty |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
534 |
def get_last_perspective: Document.Node.Perspective_Text.T = |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
535 |
GUI_Thread.require { last_perspective }
|
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
536 |
def set_last_perspective(perspective: Document.Node.Perspective_Text.T): Unit = |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
537 |
GUI_Thread.require { last_perspective = perspective }
|
| 58543 | 538 |
|
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
539 |
private var node_required = false |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
540 |
def get_node_required: Boolean = GUI_Thread.require { node_required }
|
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
541 |
def set_node_required(b: Boolean): Unit = GUI_Thread.require { node_required = b }
|
| 58543 | 542 |
|
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
543 |
private val pending_edits = new mutable.ListBuffer[Text.Edit] |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
544 |
def is_stable: Boolean = GUI_Thread.require { pending_edits.isEmpty }
|
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
545 |
def get_pending_edits: List[Text.Edit] = GUI_Thread.require { pending_edits.toList }
|
| 38224 | 546 |
|
| 64817 | 547 |
def flush_edits(doc_blobs: Document.Blobs, hidden: Boolean): List[Document.Edit_Text] = |
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
548 |
GUI_Thread.require {
|
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
549 |
val edits = get_pending_edits |
| 64817 | 550 |
val (reparse, perspective) = node_perspective(doc_blobs, hidden) |
|
64818
67a0a563d2b3
clarified buffer events: exit model while loading;
wenzelm
parents:
64817
diff
changeset
|
551 |
if (reparse || edits.nonEmpty || last_perspective != perspective) {
|
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
552 |
pending_edits.clear() |
|
61728
5f5ff1eab407
double flush to ensure persistent "state" output is reset;
wenzelm
parents:
61538
diff
changeset
|
553 |
last_perspective = perspective |
| 71601 | 554 |
node_edits(node_header(), edits, perspective) |
|
61728
5f5ff1eab407
double flush to ensure persistent "state" output is reset;
wenzelm
parents:
61538
diff
changeset
|
555 |
} |
|
5f5ff1eab407
double flush to ensure persistent "state" output is reset;
wenzelm
parents:
61538
diff
changeset
|
556 |
else Nil |
| 43648 | 557 |
} |
| 38224 | 558 |
|
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
559 |
def edit(edits: List[Text.Edit]): Unit = GUI_Thread.require {
|
| 54511 | 560 |
reset_blob() |
|
76792
23f433294173
support for generic File_Format.parse_data, with persistent result in document model;
wenzelm
parents:
76791
diff
changeset
|
561 |
reset_data() |
| 54511 | 562 |
|
| 76762 | 563 |
for (doc_view <- document_view_iterator) {
|
|
61538
bf4969660913
avoid highlighted area getting "stuck" after edit;
wenzelm
parents:
61192
diff
changeset
|
564 |
doc_view.rich_text_area.active_reset() |
| 76762 | 565 |
} |
|
61538
bf4969660913
avoid highlighted area getting "stuck" after edit;
wenzelm
parents:
61192
diff
changeset
|
566 |
|
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
567 |
pending_edits ++= edits |
| 66082 | 568 |
PIDE.editor.invoke() |
|
44436
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44385
diff
changeset
|
569 |
} |
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
570 |
|
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
571 |
|
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
572 |
// blob |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
573 |
|
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
574 |
private var blob: Option[(Bytes, String, Symbol.Text_Chunk)] = None |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
575 |
|
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
576 |
def reset_blob(): Unit = GUI_Thread.require { blob = None }
|
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
577 |
|
|
76904
e27d097d7d15
tuned signature: avoid confusion with Document.Node.Blob and Command.Blob;
wenzelm
parents:
76830
diff
changeset
|
578 |
def get_blob: Option[Document.Blobs.Item] = GUI_Thread.require {
|
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
579 |
if (is_theory) None |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
580 |
else {
|
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
581 |
val (bytes, text, chunk) = |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
582 |
blob getOrElse {
|
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
583 |
val bytes = PIDE.resources.make_file_content(buffer) |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
584 |
val text = buffer.getText(0, buffer.getLength) |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
585 |
val chunk = Symbol.Text_Chunk(text) |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
586 |
val x = (bytes, text, chunk) |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
587 |
blob = Some(x) |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
588 |
x |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
589 |
} |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
590 |
val changed = !is_stable |
|
76904
e27d097d7d15
tuned signature: avoid confusion with Document.Node.Blob and Command.Blob;
wenzelm
parents:
76830
diff
changeset
|
591 |
Some(Document.Blobs.Item(bytes, text, chunk, changed)) |
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
592 |
} |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
593 |
} |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
594 |
|
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
595 |
|
|
76792
23f433294173
support for generic File_Format.parse_data, with persistent result in document model;
wenzelm
parents:
76791
diff
changeset
|
596 |
// parsed data |
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
597 |
|
|
76792
23f433294173
support for generic File_Format.parse_data, with persistent result in document model;
wenzelm
parents:
76791
diff
changeset
|
598 |
private var data: Option[AnyRef] = None |
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
599 |
|
|
76792
23f433294173
support for generic File_Format.parse_data, with persistent result in document model;
wenzelm
parents:
76791
diff
changeset
|
600 |
def reset_data(): Unit = GUI_Thread.require { data = None }
|
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
601 |
|
|
76792
23f433294173
support for generic File_Format.parse_data, with persistent result in document model;
wenzelm
parents:
76791
diff
changeset
|
602 |
def untyped_data: AnyRef = GUI_Thread.require {
|
|
23f433294173
support for generic File_Format.parse_data, with persistent result in document model;
wenzelm
parents:
76791
diff
changeset
|
603 |
data getOrElse {
|
|
23f433294173
support for generic File_Format.parse_data, with persistent result in document model;
wenzelm
parents:
76791
diff
changeset
|
604 |
val text = JEdit_Lib.buffer_text(buffer) |
|
23f433294173
support for generic File_Format.parse_data, with persistent result in document model;
wenzelm
parents:
76791
diff
changeset
|
605 |
val res = File_Format.registry.parse_data(node_name, text) |
|
23f433294173
support for generic File_Format.parse_data, with persistent result in document model;
wenzelm
parents:
76791
diff
changeset
|
606 |
data = Some(res) |
|
23f433294173
support for generic File_Format.parse_data, with persistent result in document model;
wenzelm
parents:
76791
diff
changeset
|
607 |
res |
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
608 |
} |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
609 |
} |
|
44436
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44385
diff
changeset
|
610 |
} |
|
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44385
diff
changeset
|
611 |
|
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
612 |
def is_stable: Boolean = buffer_state.is_stable |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
613 |
def pending_edits: List[Text.Edit] = buffer_state.get_pending_edits |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
614 |
def flush_edits(doc_blobs: Document.Blobs, hidden: Boolean): List[Document.Edit_Text] = |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
615 |
buffer_state.flush_edits(doc_blobs, hidden) |
|
60933
6d03e05ef041
more robust access to stable tip version: take all pending edits into account, don't assume model for current buffer;
wenzelm
parents:
60274
diff
changeset
|
616 |
|
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
617 |
def node_required: Boolean = buffer_state.get_node_required |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
618 |
def set_node_required(b: Boolean): Unit = buffer_state.set_node_required(b) |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
619 |
|
|
76904
e27d097d7d15
tuned signature: avoid confusion with Document.Node.Blob and Command.Blob;
wenzelm
parents:
76830
diff
changeset
|
620 |
def get_blob: Option[Document.Blobs.Item] = buffer_state.get_blob |
|
76792
23f433294173
support for generic File_Format.parse_data, with persistent result in document model;
wenzelm
parents:
76791
diff
changeset
|
621 |
def untyped_data: AnyRef = buffer_state.untyped_data |
| 34828 | 622 |
|
623 |
||
624 |
/* buffer listener */ |
|
625 |
||
| 75393 | 626 |
private val buffer_listener: BufferListener = new BufferAdapter {
|
627 |
override def contentInserted( |
|
628 |
buffer: JEditBuffer, |
|
629 |
start_line: Int, |
|
630 |
offset: Int, |
|
631 |
num_lines: Int, |
|
632 |
length: Int |
|
633 |
): Unit = {
|
|
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
634 |
buffer_state.edit(List(Text.Edit.insert(offset, buffer.getText(offset, length)))) |
| 34828 | 635 |
} |
636 |
||
| 75393 | 637 |
override def preContentRemoved( |
638 |
buffer: JEditBuffer, |
|
639 |
start_line: Int, |
|
640 |
offset: Int, |
|
641 |
num_lines: Int, |
|
642 |
removed_length: Int |
|
643 |
): Unit = {
|
|
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
644 |
buffer_state.edit(List(Text.Edit.remove(offset, buffer.getText(offset, removed_length)))) |
| 34828 | 645 |
} |
646 |
} |
|
647 |
||
648 |
||
|
59078
cf255dc2b48f
more careful syntax_changed propagation -- avoid global jEdit.propertiesChanged;
wenzelm
parents:
59077
diff
changeset
|
649 |
/* syntax */ |
|
37557
1ae272fd4082
refresh Isabelle token marker after buffer properties changed, e.g. when fold mode is switched;
wenzelm
parents:
37555
diff
changeset
|
650 |
|
| 75393 | 651 |
def syntax_changed(): Unit = {
|
| 61192 | 652 |
JEdit_Lib.buffer_line_manager(buffer).setFirstInvalidLineContext(0) |
| 76762 | 653 |
for (text_area <- JEdit_Lib.jedit_text_areas(buffer)) {
|
|
59080
611914621edb
added Untyped.method convenience (for *this* class only);
wenzelm
parents:
59079
diff
changeset
|
654 |
Untyped.method(Class.forName("org.gjt.sp.jedit.textarea.TextArea"), "foldStructureChanged").
|
|
611914621edb
added Untyped.method convenience (for *this* class only);
wenzelm
parents:
59079
diff
changeset
|
655 |
invoke(text_area) |
| 76762 | 656 |
} |
| 72960 | 657 |
buffer.invalidateCachedFoldLevels() |
|
59078
cf255dc2b48f
more careful syntax_changed propagation -- avoid global jEdit.propertiesChanged;
wenzelm
parents:
59077
diff
changeset
|
658 |
} |
|
cf255dc2b48f
more careful syntax_changed propagation -- avoid global jEdit.propertiesChanged;
wenzelm
parents:
59077
diff
changeset
|
659 |
|
| 75393 | 660 |
def init_token_marker(): Unit = {
|
|
59077
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
wenzelm
parents:
59076
diff
changeset
|
661 |
Isabelle.buffer_token_marker(buffer) match {
|
|
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
wenzelm
parents:
59076
diff
changeset
|
662 |
case Some(marker) if marker != buffer.getTokenMarker => |
|
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
wenzelm
parents:
59076
diff
changeset
|
663 |
buffer.setTokenMarker(marker) |
|
59078
cf255dc2b48f
more careful syntax_changed propagation -- avoid global jEdit.propertiesChanged;
wenzelm
parents:
59077
diff
changeset
|
664 |
syntax_changed() |
|
59077
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
wenzelm
parents:
59076
diff
changeset
|
665 |
case _ => |
|
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
wenzelm
parents:
59076
diff
changeset
|
666 |
} |
|
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
wenzelm
parents:
59076
diff
changeset
|
667 |
} |
|
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
wenzelm
parents:
59076
diff
changeset
|
668 |
|
|
59078
cf255dc2b48f
more careful syntax_changed propagation -- avoid global jEdit.propertiesChanged;
wenzelm
parents:
59077
diff
changeset
|
669 |
|
| 64817 | 670 |
/* init */ |
671 |
||
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
672 |
def init(old_model: Option[File_Model]): Buffer_Model = GUI_Thread.require {
|
| 64817 | 673 |
old_model match {
|
674 |
case None => |
|
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
675 |
buffer_state.edit(List(Text.Edit.insert(0, JEdit_Lib.buffer_text(buffer)))) |
| 64817 | 676 |
case Some(file_model) => |
|
76715
bf5ff407f32f
clarified state of document model vs. document editor selection (again, see also a9d52d02bd83);
wenzelm
parents:
76706
diff
changeset
|
677 |
set_node_required(file_model.node_required) |
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
678 |
buffer_state.set_last_perspective(file_model.last_perspective) |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
679 |
buffer_state.edit( |
|
64818
67a0a563d2b3
clarified buffer events: exit model while loading;
wenzelm
parents:
64817
diff
changeset
|
680 |
file_model.pending_edits ::: |
|
67a0a563d2b3
clarified buffer events: exit model while loading;
wenzelm
parents:
64817
diff
changeset
|
681 |
Text.Edit.replace(0, file_model.content.text, JEdit_Lib.buffer_text(buffer))) |
| 64817 | 682 |
} |
683 |
||
|
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34783
diff
changeset
|
684 |
buffer.addBufferListener(buffer_listener) |
|
59078
cf255dc2b48f
more careful syntax_changed propagation -- avoid global jEdit.propertiesChanged;
wenzelm
parents:
59077
diff
changeset
|
685 |
init_token_marker() |
| 64817 | 686 |
|
687 |
this |
|
| 34680 | 688 |
} |
689 |
||
| 64817 | 690 |
|
691 |
/* exit */ |
|
692 |
||
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
693 |
def exit(): File_Model = GUI_Thread.require {
|
|
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34783
diff
changeset
|
694 |
buffer.removeBufferListener(buffer_listener) |
|
59078
cf255dc2b48f
more careful syntax_changed propagation -- avoid global jEdit.propertiesChanged;
wenzelm
parents:
59077
diff
changeset
|
695 |
init_token_marker() |
| 64817 | 696 |
|
| 76783 | 697 |
File_Model.init(session, |
698 |
content = Document_Model.File_Content(node_name, JEdit_Lib.buffer_text(buffer)), |
|
|
76775
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
699 |
node_required = node_required, |
|
01a7265db76b
clarified buffer_state: not synchronized, but exclusively owned by GUI thread;
wenzelm
parents:
76768
diff
changeset
|
700 |
last_perspective = buffer_state.get_last_perspective, |
|
76765
c654103e9c9d
more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents:
76763
diff
changeset
|
701 |
pending_edits = pending_edits) |
| 34680 | 702 |
} |
| 34447 | 703 |
} |