author | wenzelm |
Sun, 08 Jan 2017 16:47:53 +0100 | |
changeset 64835 | fd1efd6dd385 |
parent 64832 | f6a09ac4e640 |
child 64836 | 3611f759f896 |
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 |
||
34693 | 14 |
import scala.collection.mutable |
34446 | 15 |
|
64817 | 16 |
import org.gjt.sp.jedit.{jEdit, View} |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34783
diff
changeset
|
17 |
import org.gjt.sp.jedit.Buffer |
61192 | 18 |
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
|
19 |
|
34760 | 20 |
|
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34783
diff
changeset
|
21 |
object Document_Model |
34588 | 22 |
{ |
64817 | 23 |
/* document models */ |
24 |
||
25 |
sealed case class State( |
|
26 |
models: Map[Document.Node.Name, Document_Model] = Map.empty, |
|
27 |
buffer_models: Map[JEditBuffer, Buffer_Model] = Map.empty) |
|
28 |
{ |
|
29 |
def models_iterator: Iterator[Document_Model] = |
|
30 |
for ((_, model) <- models.iterator) yield model |
|
64813 | 31 |
|
64817 | 32 |
def file_models_iterator: Iterator[File_Model] = |
33 |
for { |
|
34 |
(_, model) <- models.iterator |
|
35 |
if model.isInstanceOf[File_Model] |
|
36 |
} yield model.asInstanceOf[File_Model] |
|
64813 | 37 |
|
64817 | 38 |
def buffer_models_iterator: Iterator[Buffer_Model] = |
39 |
for ((_, model) <- buffer_models.iterator) yield model |
|
64813 | 40 |
|
41 |
||
64817 | 42 |
def open_buffer(session: Session, node_name: Document.Node.Name, buffer: Buffer) |
43 |
: (Buffer_Model, State) = |
|
44 |
{ |
|
45 |
val old_model = |
|
46 |
models.get(node_name) match { |
|
47 |
case Some(file_model: File_Model) => Some(file_model) |
|
48 |
case Some(buffer_model: Buffer_Model) => Some(buffer_model.exit()) |
|
49 |
case _ => None |
|
50 |
} |
|
51 |
val buffer_model = Buffer_Model(session, node_name, buffer).init(old_model) |
|
52 |
(buffer_model, |
|
53 |
copy(models = models + (node_name -> buffer_model), |
|
54 |
buffer_models = buffer_models + (buffer -> buffer_model))) |
|
55 |
} |
|
56 |
||
57 |
def close_buffer(buffer: JEditBuffer): State = |
|
58 |
{ |
|
59 |
buffer_models.get(buffer) match { |
|
60 |
case None => this |
|
61 |
case Some(buffer_model) => |
|
62 |
val file_model = buffer_model.exit() |
|
63 |
copy(models = models + (file_model.node_name -> file_model), |
|
64 |
buffer_models = buffer_models - buffer) |
|
65 |
} |
|
66 |
} |
|
64835
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
67 |
|
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
68 |
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
|
69 |
if (models.isDefinedAt(node_name)) this |
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
70 |
else { |
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
71 |
val edit = Text.Edit.insert(0, text) |
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
72 |
val model = File_Model(session, node_name, File_Content(text), pending_edits = List(edit)) |
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
73 |
copy(models = models + (node_name -> model)) |
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
74 |
} |
64817 | 75 |
} |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34783
diff
changeset
|
76 |
|
64817 | 77 |
private val state = Synchronized(State()) // owned by GUI thread |
78 |
||
64835
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
79 |
def get_models(): Map[Document.Node.Name, Document_Model] = state.value.models |
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
80 |
def get(name: Document.Node.Name): Option[Document_Model] = get_models.get(name) |
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
81 |
def get(buffer: JEditBuffer): Option[Buffer_Model] = state.value.buffer_models.get(buffer) |
64817 | 82 |
|
64831 | 83 |
def bibtex_entries_iterator(): Iterator[Text.Info[(String, Document_Model)]] = |
64829
07f209e957bc
refer to bibtex entries via general Document_Model, instead of editor buffers;
wenzelm
parents:
64828
diff
changeset
|
84 |
for { |
07f209e957bc
refer to bibtex entries via general Document_Model, instead of editor buffers;
wenzelm
parents:
64828
diff
changeset
|
85 |
model <- state.value.models_iterator |
64832 | 86 |
Text.Info(range, entry) <- model.bibtex_entries.iterator |
64831 | 87 |
} yield Text.Info(range, (entry, model)) |
64829
07f209e957bc
refer to bibtex entries via general Document_Model, instead of editor buffers;
wenzelm
parents:
64828
diff
changeset
|
88 |
|
64817 | 89 |
|
90 |
/* init and exit */ |
|
91 |
||
92 |
def init(session: Session, node_name: Document.Node.Name, buffer: Buffer): Buffer_Model = |
|
93 |
{ |
|
94 |
GUI_Thread.require {} |
|
95 |
state.change_result(st => |
|
96 |
st.buffer_models.get(buffer) match { |
|
97 |
case Some(buffer_model) if buffer_model.node_name == node_name => |
|
98 |
buffer_model.init_token_marker |
|
99 |
(buffer_model, st) |
|
100 |
case _ => |
|
101 |
val res = st.close_buffer(buffer).open_buffer(session, node_name, buffer) |
|
102 |
buffer.propertiesChanged |
|
103 |
res |
|
104 |
}) |
|
105 |
} |
|
106 |
||
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34783
diff
changeset
|
107 |
def exit(buffer: Buffer) |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34783
diff
changeset
|
108 |
{ |
57612
990ffb84489b
clarified module name: facilitate alternative GUI frameworks;
wenzelm
parents:
57610
diff
changeset
|
109 |
GUI_Thread.require {} |
64813 | 110 |
state.change(st => |
64817 | 111 |
if (st.buffer_models.isDefinedAt(buffer)) { |
112 |
val res = st.close_buffer(buffer) |
|
113 |
buffer.propertiesChanged |
|
114 |
res |
|
115 |
} |
|
116 |
else st) |
|
117 |
} |
|
118 |
||
64835
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
119 |
def provide_files(session: Session, files: List[(Document.Node.Name, String)]) |
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
120 |
{ |
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
121 |
GUI_Thread.require {} |
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
122 |
state.change(st => |
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
123 |
(st /: files) { case (st1, (node_name, text)) => st1.provide_file(session, node_name, text) }) |
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
124 |
} |
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
125 |
|
64817 | 126 |
|
127 |
/* required nodes */ |
|
128 |
||
129 |
def required_nodes(): Set[Document.Node.Name] = |
|
130 |
(for { |
|
131 |
model <- state.value.models_iterator |
|
132 |
if model.node_required |
|
133 |
} yield model.node_name).toSet |
|
134 |
||
135 |
def node_required(name: Document.Node.Name, toggle: Boolean = false, set: Boolean = false) |
|
136 |
{ |
|
137 |
GUI_Thread.require {} |
|
138 |
||
139 |
val changed = |
|
140 |
state.change_result(st => |
|
141 |
st.models.get(name) match { |
|
142 |
case None => (false, st) |
|
143 |
case Some(model) => |
|
144 |
val required = if (toggle) !model.node_required else set |
|
145 |
model match { |
|
146 |
case model1: File_Model if required != model1.node_required => |
|
147 |
(true, st.copy(models = st.models + (name -> model1.copy(node_required = required)))) |
|
148 |
case model1: Buffer_Model if required != model1.node_required => |
|
149 |
model1.set_node_required(required); (true, st) |
|
150 |
case _ => (false, st) |
|
151 |
} |
|
152 |
}) |
|
153 |
if (changed) { |
|
154 |
PIDE.options_changed() |
|
155 |
PIDE.editor.flush() |
|
156 |
} |
|
157 |
} |
|
158 |
||
159 |
def view_node_required(view: View, toggle: Boolean = false, set: Boolean = false): Unit = |
|
160 |
Document_Model.get(view.getBuffer).foreach(model => |
|
161 |
node_required(model.node_name, toggle = toggle, set = set)) |
|
162 |
||
163 |
||
164 |
/* flushed edits */ |
|
165 |
||
166 |
def flush_edits(hidden: Boolean): (Document.Blobs, List[Document.Edit_Text]) = |
|
167 |
{ |
|
168 |
GUI_Thread.require {} |
|
169 |
||
170 |
state.change_result(st => |
|
171 |
{ |
|
172 |
val doc_blobs = |
|
173 |
Document.Blobs( |
|
174 |
(for { |
|
175 |
model <- st.models_iterator |
|
176 |
blob <- model.get_blob |
|
177 |
} yield (model.node_name -> blob)).toMap) |
|
178 |
||
179 |
val buffer_edits = |
|
180 |
(for { |
|
181 |
model <- st.buffer_models_iterator |
|
182 |
edit <- model.flush_edits(doc_blobs, hidden).iterator |
|
183 |
} yield edit).toList |
|
184 |
||
185 |
val file_edits = |
|
186 |
(for { |
|
187 |
model <- st.file_models_iterator |
|
188 |
change <- model.flush_edits(doc_blobs, hidden) |
|
189 |
} yield change).toList |
|
190 |
||
191 |
val edits = buffer_edits ::: file_edits.flatMap(_._1) |
|
192 |
||
193 |
((doc_blobs, edits), |
|
194 |
st.copy( |
|
195 |
models = (st.models /: file_edits) { case (ms, (_, m)) => ms + (m.node_name -> m) })) |
|
64813 | 196 |
}) |
34318
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
197 |
} |
43397 | 198 |
|
64817 | 199 |
|
200 |
/* file content */ |
|
201 |
||
202 |
sealed case class File_Content(text: String) |
|
203 |
{ |
|
64835
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
204 |
lazy val bytes: Bytes = Bytes(Symbol.encode(text)) |
64817 | 205 |
lazy val chunk: Symbol.Text_Chunk = Symbol.Text_Chunk(text) |
64831 | 206 |
lazy val bibtex_entries: List[Text.Info[String]] = |
207 |
try { Bibtex.document_entries(text) } |
|
64828 | 208 |
catch { case ERROR(msg) => Output.warning(msg); Nil } |
64817 | 209 |
} |
210 |
} |
|
211 |
||
64829
07f209e957bc
refer to bibtex entries via general Document_Model, instead of editor buffers;
wenzelm
parents:
64828
diff
changeset
|
212 |
sealed abstract class Document_Model extends Document.Model |
64817 | 213 |
{ |
214 |
/* content */ |
|
215 |
||
64831 | 216 |
def bibtex_entries: List[Text.Info[String]] |
64817 | 217 |
|
218 |
||
219 |
/* perspective */ |
|
220 |
||
221 |
def document_view_ranges(snapshot: Document.Snapshot): List[Text.Range] = Nil |
|
222 |
||
223 |
def node_perspective( |
|
224 |
doc_blobs: Document.Blobs, hidden: Boolean): (Boolean, Document.Node.Perspective_Text) = |
|
43397 | 225 |
{ |
57612
990ffb84489b
clarified module name: facilitate alternative GUI frameworks;
wenzelm
parents:
57610
diff
changeset
|
226 |
GUI_Thread.require {} |
64817 | 227 |
|
228 |
if (Isabelle.continuous_checking && is_theory) { |
|
229 |
val snapshot = this.snapshot() |
|
230 |
||
231 |
val reparse = snapshot.node.load_commands_changed(doc_blobs) |
|
232 |
val perspective = |
|
233 |
if (hidden) Text.Perspective.empty |
|
234 |
else { |
|
235 |
val view_ranges = document_view_ranges(snapshot) |
|
236 |
val load_ranges = snapshot.commands_loading_ranges(PIDE.editor.visible_node(_)) |
|
237 |
Text.Perspective(view_ranges ::: load_ranges) |
|
238 |
} |
|
239 |
val overlays = PIDE.editor.node_overlays(node_name) |
|
240 |
||
241 |
(reparse, Document.Node.Perspective(node_required, perspective, overlays)) |
|
242 |
} |
|
243 |
else (false, Document.Node.no_perspective_text) |
|
43397 | 244 |
} |
34318
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
245 |
} |
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
246 |
|
64817 | 247 |
case class File_Model( |
248 |
session: Session, |
|
249 |
node_name: Document.Node.Name, |
|
250 |
content: Document_Model.File_Content, |
|
251 |
node_required: Boolean = false, |
|
252 |
last_perspective: Document.Node.Perspective_Text = Document.Node.no_perspective_text, |
|
253 |
pending_edits: List[Text.Edit] = Nil) extends Document_Model |
|
34588 | 254 |
{ |
64817 | 255 |
/* header */ |
256 |
||
257 |
def node_header: Document.Node.Header = |
|
258 |
PIDE.resources.special_header(node_name) getOrElse |
|
64826
c97296294f6d
clarified check_thy_reader: check node_name here;
wenzelm
parents:
64825
diff
changeset
|
259 |
PIDE.resources.check_thy_reader("", node_name, Scan.char_reader(content.text), strict = false) |
64817 | 260 |
|
261 |
||
262 |
/* content */ |
|
263 |
||
64829
07f209e957bc
refer to bibtex entries via general Document_Model, instead of editor buffers;
wenzelm
parents:
64828
diff
changeset
|
264 |
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
|
265 |
Line.Node_Position(node_name.node, |
07f209e957bc
refer to bibtex entries via general Document_Model, instead of editor buffers;
wenzelm
parents:
64828
diff
changeset
|
266 |
Line.Position.zero.advance(content.text.substring(0, offset), Text.Length)) |
07f209e957bc
refer to bibtex entries via general Document_Model, instead of editor buffers;
wenzelm
parents:
64828
diff
changeset
|
267 |
|
64817 | 268 |
def get_blob: Option[Document.Blob] = |
269 |
if (is_theory) None |
|
270 |
else Some(Document.Blob(content.bytes, content.chunk, pending_edits.nonEmpty)) |
|
271 |
||
64831 | 272 |
def bibtex_entries: List[Text.Info[String]] = |
64828 | 273 |
if (Bibtex.check_name(node_name)) content.bibtex_entries else Nil |
64680 | 274 |
|
275 |
||
64817 | 276 |
/* edits */ |
277 |
||
278 |
def update_text(text: String): Option[File_Model] = |
|
279 |
Text.Edit.replace(0, content.text, text) match { |
|
280 |
case Nil => None |
|
281 |
case edits => |
|
282 |
val content1 = Document_Model.File_Content(text) |
|
283 |
val pending_edits1 = pending_edits ::: edits |
|
284 |
Some(copy(content = content1, pending_edits = pending_edits1)) |
|
285 |
} |
|
38222
dac5fa0ac971
replaced individual Document_Model history by all-inclusive one in Session;
wenzelm
parents:
38158
diff
changeset
|
286 |
|
64817 | 287 |
def flush_edits(doc_blobs: Document.Blobs, hidden: Boolean) |
288 |
: Option[(List[Document.Edit_Text], File_Model)] = |
|
289 |
{ |
|
290 |
val (reparse, perspective) = node_perspective(doc_blobs, hidden) |
|
291 |
if (reparse || pending_edits.nonEmpty || last_perspective != perspective) { |
|
64827
4ef1eb75f1cd
uniform Document.Model.node_edits (without void edits);
wenzelm
parents:
64826
diff
changeset
|
292 |
val edits = node_edits(pending_edits, perspective) |
64817 | 293 |
Some((edits, copy(last_perspective = perspective, pending_edits = Nil))) |
294 |
} |
|
295 |
else None |
|
296 |
} |
|
297 |
||
298 |
||
299 |
/* snapshot */ |
|
300 |
||
301 |
def is_stable: Boolean = pending_edits.isEmpty |
|
64818
67a0a563d2b3
clarified buffer events: exit model while loading;
wenzelm
parents:
64817
diff
changeset
|
302 |
def snapshot(): Document.Snapshot = session.snapshot(node_name, pending_edits) |
64817 | 303 |
} |
304 |
||
305 |
case class Buffer_Model(session: Session, node_name: Document.Node.Name, buffer: Buffer) |
|
306 |
extends Document_Model |
|
307 |
{ |
|
308 |
/* 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
|
309 |
|
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
47393
diff
changeset
|
310 |
def node_header(): Document.Node.Header = |
46920
5f44c8bea84e
more explicit indication of swing thread context;
wenzelm
parents:
46750
diff
changeset
|
311 |
{ |
57612
990ffb84489b
clarified module name: facilitate alternative GUI frameworks;
wenzelm
parents:
57610
diff
changeset
|
312 |
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
|
313 |
|
64673
b5965890e54d
more uniform treatment of file name vs. theory name and special header;
wenzelm
parents:
63446
diff
changeset
|
314 |
PIDE.resources.special_header(node_name) getOrElse |
64826
c97296294f6d
clarified check_thy_reader: check node_name here;
wenzelm
parents:
64825
diff
changeset
|
315 |
JEdit_Lib.buffer_lock(buffer) { |
c97296294f6d
clarified check_thy_reader: check node_name here;
wenzelm
parents:
64825
diff
changeset
|
316 |
PIDE.resources.check_thy_reader( |
c97296294f6d
clarified check_thy_reader: check node_name here;
wenzelm
parents:
64825
diff
changeset
|
317 |
"", node_name, JEdit_Lib.buffer_reader(buffer), strict = false) |
46748
8f3ae4d04a2d
refined node_header -- more direct buffer access (again);
wenzelm
parents:
46740
diff
changeset
|
318 |
} |
46920
5f44c8bea84e
more explicit indication of swing thread context;
wenzelm
parents:
46750
diff
changeset
|
319 |
} |
44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44379
diff
changeset
|
320 |
|
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44379
diff
changeset
|
321 |
|
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44379
diff
changeset
|
322 |
/* perspective */ |
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44379
diff
changeset
|
323 |
|
57612
990ffb84489b
clarified module name: facilitate alternative GUI frameworks;
wenzelm
parents:
57610
diff
changeset
|
324 |
// owned by GUI thread |
52816
c608e0ade554
home-grown mouse handling to pretend that the painted checkbox is actually a Swing component;
wenzelm
parents:
52815
diff
changeset
|
325 |
private var _node_required = false |
c608e0ade554
home-grown mouse handling to pretend that the painted checkbox is actually a Swing component;
wenzelm
parents:
52815
diff
changeset
|
326 |
def node_required: Boolean = _node_required |
64817 | 327 |
def set_node_required(b: Boolean) { GUI_Thread.require { _node_required = b } } |
52808
143f225e50f5
allow explicit indication of required node: full eval, no prints;
wenzelm
parents:
52807
diff
changeset
|
328 |
|
64817 | 329 |
override def document_view_ranges(snapshot: Document.Snapshot): List[Text.Range] = |
44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44379
diff
changeset
|
330 |
{ |
57612
990ffb84489b
clarified module name: facilitate alternative GUI frameworks;
wenzelm
parents:
57610
diff
changeset
|
331 |
GUI_Thread.require {} |
52759
a20631db9c8a
support declarative editor_execution_range, instead of old-style check/cancel buttons;
wenzelm
parents:
50565
diff
changeset
|
332 |
|
64817 | 333 |
(for { |
334 |
doc_view <- PIDE.document_views(buffer).iterator |
|
335 |
range <- doc_view.perspective(snapshot).ranges.iterator |
|
336 |
} yield range).toList |
|
44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44379
diff
changeset
|
337 |
} |
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44379
diff
changeset
|
338 |
|
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44379
diff
changeset
|
339 |
|
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
|
340 |
/* blob */ |
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
|
341 |
|
57612
990ffb84489b
clarified module name: facilitate alternative GUI frameworks;
wenzelm
parents:
57610
diff
changeset
|
342 |
private var _blob: Option[(Bytes, Symbol.Text_Chunk)] = None // owned by GUI thread |
54511 | 343 |
|
57612
990ffb84489b
clarified module name: facilitate alternative GUI frameworks;
wenzelm
parents:
57610
diff
changeset
|
344 |
private def reset_blob(): Unit = GUI_Thread.require { _blob = None } |
54511 | 345 |
|
64817 | 346 |
def get_blob: Option[Document.Blob] = |
57612
990ffb84489b
clarified module name: facilitate alternative GUI frameworks;
wenzelm
parents:
57610
diff
changeset
|
347 |
GUI_Thread.require { |
55783 | 348 |
if (is_theory) None |
349 |
else { |
|
56473 | 350 |
val (bytes, chunk) = |
55783 | 351 |
_blob match { |
352 |
case Some(x) => x |
|
353 |
case None => |
|
64835
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
354 |
val bytes = PIDE.resources.make_file_content(buffer) |
56746 | 355 |
val chunk = Symbol.Text_Chunk(buffer.getSegment(0, buffer.getLength)) |
56473 | 356 |
_blob = Some((bytes, chunk)) |
357 |
(bytes, chunk) |
|
55783 | 358 |
} |
64818
67a0a563d2b3
clarified buffer events: exit model while loading;
wenzelm
parents:
64817
diff
changeset
|
359 |
val changed = pending_edits.nonEmpty |
56473 | 360 |
Some(Document.Blob(bytes, chunk, changed)) |
54511 | 361 |
} |
362 |
} |
|
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
|
363 |
|
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
|
364 |
|
58543 | 365 |
/* bibtex entries */ |
366 |
||
64831 | 367 |
private var _bibtex_entries: Option[List[Text.Info[String]]] = None // owned by GUI thread |
58543 | 368 |
|
64817 | 369 |
private def reset_bibtex_entries(): Unit = GUI_Thread.require { _bibtex_entries = None } |
58543 | 370 |
|
64831 | 371 |
def bibtex_entries: List[Text.Info[String]] = |
58543 | 372 |
GUI_Thread.require { |
64828 | 373 |
if (Bibtex.check_name(node_name)) { |
64817 | 374 |
_bibtex_entries match { |
58543 | 375 |
case Some(entries) => entries |
376 |
case None => |
|
64817 | 377 |
val text = JEdit_Lib.buffer_text(buffer) |
64828 | 378 |
val entries = |
64831 | 379 |
try { Bibtex.document_entries(text) } |
64828 | 380 |
catch { case ERROR(msg) => Output.warning(msg); Nil } |
64817 | 381 |
_bibtex_entries = Some(entries) |
58543 | 382 |
entries |
383 |
} |
|
384 |
} |
|
385 |
else Nil |
|
386 |
} |
|
387 |
||
388 |
||
50344
608265769ce0
emit bulk edits on initialization of multiple buffers, which greatly improves performance when starting big sessions (e.g. JinjaThreads);
wenzelm
parents:
50207
diff
changeset
|
389 |
/* pending edits */ |
43648 | 390 |
|
60272
4f72b00d9952
no GUI_Thread for SideKick parsers (in contrast to 4c8205fe3644), to avoid danger of deadlock due to nested context switch;
wenzelm
parents:
59737
diff
changeset
|
391 |
private object pending_edits |
38224 | 392 |
{ |
38425 | 393 |
private val pending = new mutable.ListBuffer[Text.Edit] |
57615
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents:
57612
diff
changeset
|
394 |
private var last_perspective = Document.Node.no_perspective_text |
44438 | 395 |
|
64818
67a0a563d2b3
clarified buffer events: exit model while loading;
wenzelm
parents:
64817
diff
changeset
|
396 |
def nonEmpty: Boolean = synchronized { pending.nonEmpty } |
67a0a563d2b3
clarified buffer events: exit model while loading;
wenzelm
parents:
64817
diff
changeset
|
397 |
def get_edits: List[Text.Edit] = synchronized { pending.toList } |
64817 | 398 |
def get_last_perspective: Document.Node.Perspective_Text = synchronized { last_perspective } |
399 |
def set_last_perspective(perspective: Document.Node.Perspective_Text): Unit = |
|
400 |
synchronized { last_perspective = perspective } |
|
38224 | 401 |
|
64817 | 402 |
def flush_edits(doc_blobs: Document.Blobs, hidden: Boolean): List[Document.Edit_Text] = |
61728
5f5ff1eab407
double flush to ensure persistent "state" output is reset;
wenzelm
parents:
61538
diff
changeset
|
403 |
synchronized { |
5f5ff1eab407
double flush to ensure persistent "state" output is reset;
wenzelm
parents:
61538
diff
changeset
|
404 |
GUI_Thread.require {} |
60272
4f72b00d9952
no GUI_Thread for SideKick parsers (in contrast to 4c8205fe3644), to avoid danger of deadlock due to nested context switch;
wenzelm
parents:
59737
diff
changeset
|
405 |
|
64818
67a0a563d2b3
clarified buffer events: exit model while loading;
wenzelm
parents:
64817
diff
changeset
|
406 |
val edits = get_edits |
64817 | 407 |
val (reparse, perspective) = node_perspective(doc_blobs, hidden) |
64818
67a0a563d2b3
clarified buffer events: exit model while loading;
wenzelm
parents:
64817
diff
changeset
|
408 |
if (reparse || edits.nonEmpty || last_perspective != perspective) { |
61728
5f5ff1eab407
double flush to ensure persistent "state" output is reset;
wenzelm
parents:
61538
diff
changeset
|
409 |
pending.clear |
5f5ff1eab407
double flush to ensure persistent "state" output is reset;
wenzelm
parents:
61538
diff
changeset
|
410 |
last_perspective = perspective |
64818
67a0a563d2b3
clarified buffer events: exit model while loading;
wenzelm
parents:
64817
diff
changeset
|
411 |
node_edits(edits, perspective) |
61728
5f5ff1eab407
double flush to ensure persistent "state" output is reset;
wenzelm
parents:
61538
diff
changeset
|
412 |
} |
5f5ff1eab407
double flush to ensure persistent "state" output is reset;
wenzelm
parents:
61538
diff
changeset
|
413 |
else Nil |
43648 | 414 |
} |
38224 | 415 |
|
64818
67a0a563d2b3
clarified buffer events: exit model while loading;
wenzelm
parents:
64817
diff
changeset
|
416 |
def edit(edits: List[Text.Edit]): Unit = synchronized |
38224 | 417 |
{ |
60272
4f72b00d9952
no GUI_Thread for SideKick parsers (in contrast to 4c8205fe3644), to avoid danger of deadlock due to nested context switch;
wenzelm
parents:
59737
diff
changeset
|
418 |
GUI_Thread.require {} |
4f72b00d9952
no GUI_Thread for SideKick parsers (in contrast to 4c8205fe3644), to avoid danger of deadlock due to nested context switch;
wenzelm
parents:
59737
diff
changeset
|
419 |
|
54511 | 420 |
reset_blob() |
64817 | 421 |
reset_bibtex_entries() |
54511 | 422 |
|
61538
bf4969660913
avoid highlighted area getting "stuck" after edit;
wenzelm
parents:
61192
diff
changeset
|
423 |
for (doc_view <- PIDE.document_views(buffer)) |
bf4969660913
avoid highlighted area getting "stuck" after edit;
wenzelm
parents:
61192
diff
changeset
|
424 |
doc_view.rich_text_area.active_reset() |
bf4969660913
avoid highlighted area getting "stuck" after edit;
wenzelm
parents:
61192
diff
changeset
|
425 |
|
64818
67a0a563d2b3
clarified buffer events: exit model while loading;
wenzelm
parents:
64817
diff
changeset
|
426 |
pending ++= edits |
54461 | 427 |
PIDE.editor.invoke() |
44436
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44385
diff
changeset
|
428 |
} |
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44385
diff
changeset
|
429 |
} |
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44385
diff
changeset
|
430 |
|
64835
fd1efd6dd385
resolve dependencies implicitly via File_Model, without jEdit Buffer_Model;
wenzelm
parents:
64832
diff
changeset
|
431 |
def is_stable: Boolean = !pending_edits.nonEmpty |
64818
67a0a563d2b3
clarified buffer events: exit model while loading;
wenzelm
parents:
64817
diff
changeset
|
432 |
def snapshot(): Document.Snapshot = session.snapshot(node_name, pending_edits.get_edits) |
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
|
433 |
|
64817 | 434 |
def flush_edits(doc_blobs: Document.Blobs, hidden: Boolean): List[Document.Edit_Text] = |
435 |
pending_edits.flush_edits(doc_blobs, hidden) |
|
34828 | 436 |
|
437 |
||
438 |
/* buffer listener */ |
|
439 |
||
440 |
private val buffer_listener: BufferListener = new BufferAdapter |
|
441 |
{ |
|
442 |
override def contentInserted(buffer: JEditBuffer, |
|
443 |
start_line: Int, offset: Int, num_lines: Int, length: Int) |
|
444 |
{ |
|
64818
67a0a563d2b3
clarified buffer events: exit model while loading;
wenzelm
parents:
64817
diff
changeset
|
445 |
pending_edits.edit(List(Text.Edit.insert(offset, buffer.getText(offset, length)))) |
34828 | 446 |
} |
447 |
||
448 |
override def preContentRemoved(buffer: JEditBuffer, |
|
38426 | 449 |
start_line: Int, offset: Int, num_lines: Int, removed_length: Int) |
34828 | 450 |
{ |
64818
67a0a563d2b3
clarified buffer events: exit model while loading;
wenzelm
parents:
64817
diff
changeset
|
451 |
pending_edits.edit(List(Text.Edit.remove(offset, buffer.getText(offset, removed_length)))) |
34828 | 452 |
} |
453 |
} |
|
454 |
||
455 |
||
59078
cf255dc2b48f
more careful syntax_changed propagation -- avoid global jEdit.propertiesChanged;
wenzelm
parents:
59077
diff
changeset
|
456 |
/* syntax */ |
37557
1ae272fd4082
refresh Isabelle token marker after buffer properties changed, e.g. when fold mode is switched;
wenzelm
parents:
37555
diff
changeset
|
457 |
|
59078
cf255dc2b48f
more careful syntax_changed propagation -- avoid global jEdit.propertiesChanged;
wenzelm
parents:
59077
diff
changeset
|
458 |
def syntax_changed() |
cf255dc2b48f
more careful syntax_changed propagation -- avoid global jEdit.propertiesChanged;
wenzelm
parents:
59077
diff
changeset
|
459 |
{ |
61192 | 460 |
JEdit_Lib.buffer_line_manager(buffer).setFirstInvalidLineContext(0) |
59080
611914621edb
added Untyped.method convenience (for *this* class only);
wenzelm
parents:
59079
diff
changeset
|
461 |
for (text_area <- JEdit_Lib.jedit_text_areas(buffer)) |
611914621edb
added Untyped.method convenience (for *this* class only);
wenzelm
parents:
59079
diff
changeset
|
462 |
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
|
463 |
invoke(text_area) |
62246
d9410066dbd5
more thorough syntax_changed: new commands need require new folds;
wenzelm
parents:
61728
diff
changeset
|
464 |
buffer.invalidateCachedFoldLevels |
59078
cf255dc2b48f
more careful syntax_changed propagation -- avoid global jEdit.propertiesChanged;
wenzelm
parents:
59077
diff
changeset
|
465 |
} |
cf255dc2b48f
more careful syntax_changed propagation -- avoid global jEdit.propertiesChanged;
wenzelm
parents:
59077
diff
changeset
|
466 |
|
64817 | 467 |
def init_token_marker() |
59077
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
wenzelm
parents:
59076
diff
changeset
|
468 |
{ |
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
wenzelm
parents:
59076
diff
changeset
|
469 |
Isabelle.buffer_token_marker(buffer) match { |
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
wenzelm
parents:
59076
diff
changeset
|
470 |
case Some(marker) if marker != buffer.getTokenMarker => |
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
wenzelm
parents:
59076
diff
changeset
|
471 |
buffer.setTokenMarker(marker) |
59078
cf255dc2b48f
more careful syntax_changed propagation -- avoid global jEdit.propertiesChanged;
wenzelm
parents:
59077
diff
changeset
|
472 |
syntax_changed() |
59077
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
wenzelm
parents:
59076
diff
changeset
|
473 |
case _ => |
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
wenzelm
parents:
59076
diff
changeset
|
474 |
} |
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
wenzelm
parents:
59076
diff
changeset
|
475 |
} |
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
wenzelm
parents:
59076
diff
changeset
|
476 |
|
59078
cf255dc2b48f
more careful syntax_changed propagation -- avoid global jEdit.propertiesChanged;
wenzelm
parents:
59077
diff
changeset
|
477 |
|
64817 | 478 |
/* init */ |
479 |
||
480 |
def init(old_model: Option[File_Model]): Buffer_Model = |
|
481 |
{ |
|
482 |
GUI_Thread.require {} |
|
59078
cf255dc2b48f
more careful syntax_changed propagation -- avoid global jEdit.propertiesChanged;
wenzelm
parents:
59077
diff
changeset
|
483 |
|
64817 | 484 |
old_model match { |
485 |
case None => |
|
64818
67a0a563d2b3
clarified buffer events: exit model while loading;
wenzelm
parents:
64817
diff
changeset
|
486 |
pending_edits.edit(List(Text.Edit.insert(0, JEdit_Lib.buffer_text(buffer)))) |
64817 | 487 |
case Some(file_model) => |
488 |
set_node_required(file_model.node_required) |
|
489 |
pending_edits.set_last_perspective(file_model.last_perspective) |
|
64818
67a0a563d2b3
clarified buffer events: exit model while loading;
wenzelm
parents:
64817
diff
changeset
|
490 |
pending_edits.edit( |
67a0a563d2b3
clarified buffer events: exit model while loading;
wenzelm
parents:
64817
diff
changeset
|
491 |
file_model.pending_edits ::: |
67a0a563d2b3
clarified buffer events: exit model while loading;
wenzelm
parents:
64817
diff
changeset
|
492 |
Text.Edit.replace(0, file_model.content.text, JEdit_Lib.buffer_text(buffer))) |
64817 | 493 |
} |
494 |
||
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34783
diff
changeset
|
495 |
buffer.addBufferListener(buffer_listener) |
59078
cf255dc2b48f
more careful syntax_changed propagation -- avoid global jEdit.propertiesChanged;
wenzelm
parents:
59077
diff
changeset
|
496 |
init_token_marker() |
64817 | 497 |
|
498 |
this |
|
34680 | 499 |
} |
500 |
||
64817 | 501 |
|
502 |
/* exit */ |
|
503 |
||
504 |
def exit(): File_Model = |
|
34680 | 505 |
{ |
64817 | 506 |
GUI_Thread.require {} |
507 |
||
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34783
diff
changeset
|
508 |
buffer.removeBufferListener(buffer_listener) |
59078
cf255dc2b48f
more careful syntax_changed propagation -- avoid global jEdit.propertiesChanged;
wenzelm
parents:
59077
diff
changeset
|
509 |
init_token_marker() |
64817 | 510 |
|
511 |
val content = Document_Model.File_Content(JEdit_Lib.buffer_text(buffer)) |
|
512 |
File_Model(session, node_name, content, node_required, |
|
64818
67a0a563d2b3
clarified buffer events: exit model while loading;
wenzelm
parents:
64817
diff
changeset
|
513 |
pending_edits.get_last_perspective, pending_edits.get_edits) |
34680 | 514 |
} |
34447 | 515 |
} |