author | wenzelm |
Mon, 07 Apr 2014 23:02:29 +0200 | |
changeset 56458 | a8d960baa5c2 |
parent 56395 | 0546e036d1c0 |
child 56495 | 0b9334adcf05 |
permissions | -rw-r--r-- |
50202 | 1 |
/* Title: Tools/jEdit/src/rendering.scala |
39178
83e9f3ccea9f
concentrate Isabelle specific physical rendering markup selection in isabelle_markup.scala;
wenzelm
parents:
diff
changeset
|
2 |
Author: Makarius |
83e9f3ccea9f
concentrate Isabelle specific physical rendering markup selection in isabelle_markup.scala;
wenzelm
parents:
diff
changeset
|
3 |
|
50199
6d04e2422769
quasi-abstract module Rendering, with Isabelle-specific implementation;
wenzelm
parents:
50196
diff
changeset
|
4 |
Isabelle-specific implementation of quasi-abstract rendering and |
6d04e2422769
quasi-abstract module Rendering, with Isabelle-specific implementation;
wenzelm
parents:
50196
diff
changeset
|
5 |
markup interpretation. |
39178
83e9f3ccea9f
concentrate Isabelle specific physical rendering markup selection in isabelle_markup.scala;
wenzelm
parents:
diff
changeset
|
6 |
*/ |
83e9f3ccea9f
concentrate Isabelle specific physical rendering markup selection in isabelle_markup.scala;
wenzelm
parents:
diff
changeset
|
7 |
|
83e9f3ccea9f
concentrate Isabelle specific physical rendering markup selection in isabelle_markup.scala;
wenzelm
parents:
diff
changeset
|
8 |
package isabelle.jedit |
83e9f3ccea9f
concentrate Isabelle specific physical rendering markup selection in isabelle_markup.scala;
wenzelm
parents:
diff
changeset
|
9 |
|
83e9f3ccea9f
concentrate Isabelle specific physical rendering markup selection in isabelle_markup.scala;
wenzelm
parents:
diff
changeset
|
10 |
|
83e9f3ccea9f
concentrate Isabelle specific physical rendering markup selection in isabelle_markup.scala;
wenzelm
parents:
diff
changeset
|
11 |
import isabelle._ |
83e9f3ccea9f
concentrate Isabelle specific physical rendering markup selection in isabelle_markup.scala;
wenzelm
parents:
diff
changeset
|
12 |
|
83e9f3ccea9f
concentrate Isabelle specific physical rendering markup selection in isabelle_markup.scala;
wenzelm
parents:
diff
changeset
|
13 |
import java.awt.Color |
46227
4aa84f84d5e8
more precise rendering of overview_color/gutter_message/squiggly_underline based on cumulation of command status and warning/error messages;
wenzelm
parents:
46224
diff
changeset
|
14 |
import javax.swing.Icon |
39178
83e9f3ccea9f
concentrate Isabelle specific physical rendering markup selection in isabelle_markup.scala;
wenzelm
parents:
diff
changeset
|
15 |
|
43414 | 16 |
import org.gjt.sp.jedit.syntax.{Token => JEditToken} |
53272 | 17 |
import org.gjt.sp.jedit.{jEdit, View} |
39178
83e9f3ccea9f
concentrate Isabelle specific physical rendering markup selection in isabelle_markup.scala;
wenzelm
parents:
diff
changeset
|
18 |
|
45460 | 19 |
import scala.collection.immutable.SortedMap |
20 |
||
39178
83e9f3ccea9f
concentrate Isabelle specific physical rendering markup selection in isabelle_markup.scala;
wenzelm
parents:
diff
changeset
|
21 |
|
50199
6d04e2422769
quasi-abstract module Rendering, with Isabelle-specific implementation;
wenzelm
parents:
50196
diff
changeset
|
22 |
object Rendering |
39178
83e9f3ccea9f
concentrate Isabelle specific physical rendering markup selection in isabelle_markup.scala;
wenzelm
parents:
diff
changeset
|
23 |
{ |
50199
6d04e2422769
quasi-abstract module Rendering, with Isabelle-specific implementation;
wenzelm
parents:
50196
diff
changeset
|
24 |
def apply(snapshot: Document.Snapshot, options: Options): Rendering = |
6d04e2422769
quasi-abstract module Rendering, with Isabelle-specific implementation;
wenzelm
parents:
50196
diff
changeset
|
25 |
new Rendering(snapshot, options) |
39178
83e9f3ccea9f
concentrate Isabelle specific physical rendering markup selection in isabelle_markup.scala;
wenzelm
parents:
diff
changeset
|
26 |
|
49356 | 27 |
|
49406 | 28 |
/* message priorities */ |
43388 | 29 |
|
46227
4aa84f84d5e8
more precise rendering of overview_color/gutter_message/squiggly_underline based on cumulation of command status and warning/error messages;
wenzelm
parents:
46224
diff
changeset
|
30 |
private val writeln_pri = 1 |
52644 | 31 |
private val information_pri = 2 |
32 |
private val tracing_pri = 3 |
|
33 |
private val warning_pri = 4 |
|
34 |
private val legacy_pri = 5 |
|
35 |
private val error_pri = 6 |
|
49474 | 36 |
|
37 |
private val message_pri = Map( |
|
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
38 |
Markup.WRITELN -> writeln_pri, Markup.WRITELN_MESSAGE -> writeln_pri, |
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
39 |
Markup.TRACING -> tracing_pri, Markup.TRACING_MESSAGE -> tracing_pri, |
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
40 |
Markup.WARNING -> warning_pri, Markup.WARNING_MESSAGE -> warning_pri, |
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
41 |
Markup.ERROR -> error_pri, Markup.ERROR_MESSAGE -> error_pri) |
39178
83e9f3ccea9f
concentrate Isabelle specific physical rendering markup selection in isabelle_markup.scala;
wenzelm
parents:
diff
changeset
|
42 |
|
49406 | 43 |
|
53230 | 44 |
/* popup window bounds */ |
45 |
||
46 |
def popup_bounds: Double = (PIDE.options.real("jedit_popup_bounds") max 0.2) min 0.8 |
|
47 |
||
48 |
||
55501 | 49 |
/* Isabelle/Isar token markup */ |
39179
591bbab9ef59
moved token markup tables to isabelle_markup.scala;
wenzelm
parents:
39178
diff
changeset
|
50 |
|
591bbab9ef59
moved token markup tables to isabelle_markup.scala;
wenzelm
parents:
39178
diff
changeset
|
51 |
private val command_style: Map[String, Byte] = |
591bbab9ef59
moved token markup tables to isabelle_markup.scala;
wenzelm
parents:
39178
diff
changeset
|
52 |
{ |
43414 | 53 |
import JEditToken._ |
39179
591bbab9ef59
moved token markup tables to isabelle_markup.scala;
wenzelm
parents:
39178
diff
changeset
|
54 |
Map[String, Byte]( |
591bbab9ef59
moved token markup tables to isabelle_markup.scala;
wenzelm
parents:
39178
diff
changeset
|
55 |
Keyword.THY_END -> KEYWORD2, |
53571
e58ca0311c0f
more explicit indication of 'done' as proof script element;
wenzelm
parents:
53371
diff
changeset
|
56 |
Keyword.QED_SCRIPT -> DIGIT, |
50643 | 57 |
Keyword.PRF_SCRIPT -> DIGIT, |
39179
591bbab9ef59
moved token markup tables to isabelle_markup.scala;
wenzelm
parents:
39178
diff
changeset
|
58 |
Keyword.PRF_ASM -> KEYWORD3, |
53371
47b23c582127
more explicit indication of 'guess' as improper Isar (aka "script") element;
wenzelm
parents:
53272
diff
changeset
|
59 |
Keyword.PRF_ASM_GOAL -> KEYWORD3, |
47b23c582127
more explicit indication of 'guess' as improper Isar (aka "script") element;
wenzelm
parents:
53272
diff
changeset
|
60 |
Keyword.PRF_ASM_GOAL_SCRIPT -> DIGIT |
39179
591bbab9ef59
moved token markup tables to isabelle_markup.scala;
wenzelm
parents:
39178
diff
changeset
|
61 |
).withDefaultValue(KEYWORD1) |
591bbab9ef59
moved token markup tables to isabelle_markup.scala;
wenzelm
parents:
39178
diff
changeset
|
62 |
} |
591bbab9ef59
moved token markup tables to isabelle_markup.scala;
wenzelm
parents:
39178
diff
changeset
|
63 |
|
43414 | 64 |
private val token_style: Map[Token.Kind.Value, Byte] = |
39179
591bbab9ef59
moved token markup tables to isabelle_markup.scala;
wenzelm
parents:
39178
diff
changeset
|
65 |
{ |
43414 | 66 |
import JEditToken._ |
67 |
Map[Token.Kind.Value, Byte]( |
|
68 |
Token.Kind.KEYWORD -> KEYWORD2, |
|
69 |
Token.Kind.IDENT -> NULL, |
|
70 |
Token.Kind.LONG_IDENT -> NULL, |
|
71 |
Token.Kind.SYM_IDENT -> NULL, |
|
72 |
Token.Kind.VAR -> NULL, |
|
73 |
Token.Kind.TYPE_IDENT -> NULL, |
|
74 |
Token.Kind.TYPE_VAR -> NULL, |
|
75 |
Token.Kind.NAT -> NULL, |
|
76 |
Token.Kind.FLOAT -> NULL, |
|
43431 | 77 |
Token.Kind.STRING -> LITERAL1, |
78 |
Token.Kind.ALT_STRING -> LITERAL2, |
|
43414 | 79 |
Token.Kind.VERBATIM -> COMMENT3, |
55033 | 80 |
Token.Kind.CARTOUCHE -> COMMENT4, |
43414 | 81 |
Token.Kind.SPACE -> NULL, |
82 |
Token.Kind.COMMENT -> COMMENT1, |
|
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48751
diff
changeset
|
83 |
Token.Kind.ERROR -> INVALID |
39179
591bbab9ef59
moved token markup tables to isabelle_markup.scala;
wenzelm
parents:
39178
diff
changeset
|
84 |
).withDefaultValue(NULL) |
591bbab9ef59
moved token markup tables to isabelle_markup.scala;
wenzelm
parents:
39178
diff
changeset
|
85 |
} |
591bbab9ef59
moved token markup tables to isabelle_markup.scala;
wenzelm
parents:
39178
diff
changeset
|
86 |
|
43414 | 87 |
def token_markup(syntax: Outer_Syntax, token: Token): Byte = |
43430
1ed88ddf1268
more uniform treatment of "keyword" vs. "operator";
wenzelm
parents:
43418
diff
changeset
|
88 |
if (token.is_command) command_style(syntax.keyword_kind(token.content).getOrElse("")) |
55505 | 89 |
else if (token.is_delimiter) JEditToken.OPERATOR |
43414 | 90 |
else token_style(token.kind) |
55500 | 91 |
|
55501 | 92 |
|
93 |
/* Isabelle/ML token markup */ |
|
94 |
||
55500 | 95 |
private val ml_token_style: Map[ML_Lex.Kind.Value, Byte] = |
96 |
{ |
|
97 |
import JEditToken._ |
|
98 |
Map[ML_Lex.Kind.Value, Byte]( |
|
55505 | 99 |
ML_Lex.Kind.KEYWORD -> NULL, |
55500 | 100 |
ML_Lex.Kind.IDENT -> NULL, |
101 |
ML_Lex.Kind.LONG_IDENT -> NULL, |
|
102 |
ML_Lex.Kind.TYPE_VAR -> NULL, |
|
55503 | 103 |
ML_Lex.Kind.WORD -> DIGIT, |
104 |
ML_Lex.Kind.INT -> DIGIT, |
|
105 |
ML_Lex.Kind.REAL -> DIGIT, |
|
55500 | 106 |
ML_Lex.Kind.CHAR -> LITERAL2, |
107 |
ML_Lex.Kind.STRING -> LITERAL1, |
|
108 |
ML_Lex.Kind.SPACE -> NULL, |
|
109 |
ML_Lex.Kind.COMMENT -> COMMENT1, |
|
55512 | 110 |
ML_Lex.Kind.ANTIQ -> NULL, |
111 |
ML_Lex.Kind.ANTIQ_START -> LITERAL4, |
|
112 |
ML_Lex.Kind.ANTIQ_STOP -> LITERAL4, |
|
113 |
ML_Lex.Kind.ANTIQ_OTHER -> NULL, |
|
55514
8ef781e282d9
more uniform rendering of text that is formally interpreted: avoid clash with inner markup;
wenzelm
parents:
55512
diff
changeset
|
114 |
ML_Lex.Kind.ANTIQ_STRING -> NULL, |
8ef781e282d9
more uniform rendering of text that is formally interpreted: avoid clash with inner markup;
wenzelm
parents:
55512
diff
changeset
|
115 |
ML_Lex.Kind.ANTIQ_ALT_STRING -> NULL, |
8ef781e282d9
more uniform rendering of text that is formally interpreted: avoid clash with inner markup;
wenzelm
parents:
55512
diff
changeset
|
116 |
ML_Lex.Kind.ANTIQ_CARTOUCHE -> NULL, |
55500 | 117 |
ML_Lex.Kind.ERROR -> INVALID |
118 |
).withDefaultValue(NULL) |
|
119 |
} |
|
120 |
||
121 |
def ml_token_markup(token: ML_Lex.Token): Byte = |
|
55501 | 122 |
if (!token.is_keyword) ml_token_style(token.kind) |
55505 | 123 |
else if (token.is_delimiter) JEditToken.OPERATOR |
124 |
else if (ML_Lex.keywords2(token.source)) JEditToken.KEYWORD2 |
|
125 |
else if (ML_Lex.keywords3(token.source)) JEditToken.KEYWORD3 |
|
55501 | 126 |
else JEditToken.KEYWORD1 |
55647 | 127 |
|
128 |
||
129 |
/* markup elements */ |
|
130 |
||
56173 | 131 |
private val semantic_completion_elements = |
55914
c5b752d549e3
clarified init_assignable: make double-sure that initial values are reset;
wenzelm
parents:
55883
diff
changeset
|
132 |
Document.Elements(Markup.COMPLETION, Markup.NO_COMPLETION) |
55674 | 133 |
|
56173 | 134 |
private val language_context_elements = |
55820
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55790
diff
changeset
|
135 |
Document.Elements(Markup.STRING, Markup.ALTSTRING, Markup.VERBATIM, |
55647 | 136 |
Markup.CARTOUCHE, Markup.COMMENT, Markup.LANGUAGE, |
137 |
Markup.ML_STRING, Markup.ML_COMMENT) |
|
138 |
||
139 |
private val highlight_elements = |
|
55820
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55790
diff
changeset
|
140 |
Document.Elements(Markup.LANGUAGE, Markup.ML_TYPING, Markup.TOKEN_RANGE, |
55647 | 141 |
Markup.ENTITY, Markup.PATH, Markup.URL, Markup.SORTING, |
142 |
Markup.TYPING, Markup.FREE, Markup.SKOLEM, Markup.BOUND, |
|
143 |
Markup.VAR, Markup.TFREE, Markup.TVAR) |
|
144 |
||
145 |
private val hyperlink_elements = |
|
55820
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55790
diff
changeset
|
146 |
Document.Elements(Markup.ENTITY, Markup.PATH, Markup.POSITION, Markup.URL) |
55647 | 147 |
|
148 |
private val active_elements = |
|
55820
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55790
diff
changeset
|
149 |
Document.Elements(Markup.DIALOG, Markup.BROWSER, Markup.GRAPHVIEW, |
55647 | 150 |
Markup.SENDBACK, Markup.SIMP_TRACE) |
151 |
||
152 |
private val tooltip_message_elements = |
|
55820
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55790
diff
changeset
|
153 |
Document.Elements(Markup.WRITELN, Markup.WARNING, Markup.ERROR, Markup.BAD) |
55647 | 154 |
|
155 |
private val tooltip_descriptions = |
|
156 |
Map( |
|
157 |
Markup.TOKEN_RANGE -> "inner syntax token", |
|
158 |
Markup.FREE -> "free variable", |
|
159 |
Markup.SKOLEM -> "skolem variable", |
|
160 |
Markup.BOUND -> "bound variable", |
|
161 |
Markup.VAR -> "schematic variable", |
|
162 |
Markup.TFREE -> "free type variable", |
|
163 |
Markup.TVAR -> "schematic type variable") |
|
164 |
||
165 |
private val tooltip_elements = |
|
55820
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55790
diff
changeset
|
166 |
Document.Elements(Markup.LANGUAGE, Markup.TIMING, Markup.ENTITY, Markup.SORTING, |
55647 | 167 |
Markup.TYPING, Markup.ML_TYPING, Markup.PATH, Markup.URL) ++ |
55820
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55790
diff
changeset
|
168 |
Document.Elements(tooltip_descriptions.keySet) |
55647 | 169 |
|
170 |
private val gutter_elements = |
|
55820
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55790
diff
changeset
|
171 |
Document.Elements(Markup.WRITELN, Markup.WARNING, Markup.ERROR) |
55647 | 172 |
|
173 |
private val squiggly_elements = |
|
55820
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55790
diff
changeset
|
174 |
Document.Elements(Markup.WRITELN, Markup.WARNING, Markup.ERROR) |
55647 | 175 |
|
176 |
private val line_background_elements = |
|
55820
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55790
diff
changeset
|
177 |
Document.Elements(Markup.WRITELN_MESSAGE, Markup.TRACING_MESSAGE, |
55647 | 178 |
Markup.WARNING_MESSAGE, Markup.ERROR_MESSAGE, |
179 |
Markup.INFORMATION) |
|
180 |
||
55820
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55790
diff
changeset
|
181 |
private val separator_elements = |
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55790
diff
changeset
|
182 |
Document.Elements(Markup.SEPARATOR) |
55647 | 183 |
|
55790
4670f18baba5
simplified rendering -- no need to over-emphasize "token_range";
wenzelm
parents:
55765
diff
changeset
|
184 |
private val background_elements = |
56395
0546e036d1c0
more direct warning within persistent Protocol.Status;
wenzelm
parents:
56372
diff
changeset
|
185 |
Protocol.proper_status_elements + Markup.WRITELN_MESSAGE + |
55647 | 186 |
Markup.TRACING_MESSAGE + Markup.WARNING_MESSAGE + |
187 |
Markup.ERROR_MESSAGE + Markup.BAD + Markup.INTENSIFY ++ |
|
188 |
active_elements |
|
189 |
||
190 |
private val foreground_elements = |
|
55820
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55790
diff
changeset
|
191 |
Document.Elements(Markup.STRING, Markup.ALTSTRING, Markup.VERBATIM, |
55647 | 192 |
Markup.CARTOUCHE, Markup.ANTIQUOTED) |
193 |
||
55820
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55790
diff
changeset
|
194 |
private val bullet_elements = |
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55790
diff
changeset
|
195 |
Document.Elements(Markup.BULLET) |
55647 | 196 |
|
197 |
private val fold_depth_elements = |
|
55820
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55790
diff
changeset
|
198 |
Document.Elements(Markup.TEXT_FOLD, Markup.GOAL, Markup.SUBGOAL) |
39178
83e9f3ccea9f
concentrate Isabelle specific physical rendering markup selection in isabelle_markup.scala;
wenzelm
parents:
diff
changeset
|
199 |
} |
49356 | 200 |
|
201 |
||
50199
6d04e2422769
quasi-abstract module Rendering, with Isabelle-specific implementation;
wenzelm
parents:
50196
diff
changeset
|
202 |
class Rendering private(val snapshot: Document.Snapshot, val options: Options) |
49356 | 203 |
{ |
55710 | 204 |
override def toString: String = "Rendering(" + snapshot.toString + ")" |
205 |
||
206 |
||
49356 | 207 |
/* colors */ |
208 |
||
209 |
def color_value(s: String): Color = Color_Value(options.string(s)) |
|
210 |
||
211 |
val outdated_color = color_value("outdated_color") |
|
212 |
val unprocessed_color = color_value("unprocessed_color") |
|
213 |
val unprocessed1_color = color_value("unprocessed1_color") |
|
214 |
val running_color = color_value("running_color") |
|
215 |
val running1_color = color_value("running1_color") |
|
51574
2b58d7b139d6
ghost bullet via markup, which is painted as bar under text (normally space);
wenzelm
parents:
51496
diff
changeset
|
216 |
val bullet_color = color_value("bullet_color") |
49706 | 217 |
val tooltip_color = color_value("tooltip_color") |
49356 | 218 |
val writeln_color = color_value("writeln_color") |
52650 | 219 |
val information_color = color_value("information_color") |
49356 | 220 |
val warning_color = color_value("warning_color") |
221 |
val error_color = color_value("error_color") |
|
222 |
val error1_color = color_value("error1_color") |
|
49418 | 223 |
val writeln_message_color = color_value("writeln_message_color") |
52650 | 224 |
val information_message_color = color_value("information_message_color") |
49418 | 225 |
val tracing_message_color = color_value("tracing_message_color") |
226 |
val warning_message_color = color_value("warning_message_color") |
|
227 |
val error_message_color = color_value("error_message_color") |
|
49356 | 228 |
val bad_color = color_value("bad_color") |
49358 | 229 |
val intensify_color = color_value("intensify_color") |
49356 | 230 |
val quoted_color = color_value("quoted_color") |
52101
7679178b0aa5
less intrusive rendering of antiquoted text -- avoid visual clash with "blue variables" in particular;
wenzelm
parents:
52081
diff
changeset
|
231 |
val antiquoted_color = color_value("antiquoted_color") |
55526 | 232 |
val antiquote_color = color_value("antiquote_color") |
49358 | 233 |
val highlight_color = color_value("highlight_color") |
49356 | 234 |
val hyperlink_color = color_value("hyperlink_color") |
50450
358b6020f8b6
generalized notion of active area, where sendback is just one application;
wenzelm
parents:
50215
diff
changeset
|
235 |
val active_color = color_value("active_color") |
358b6020f8b6
generalized notion of active area, where sendback is just one application;
wenzelm
parents:
50215
diff
changeset
|
236 |
val active_hover_color = color_value("active_hover_color") |
50498 | 237 |
val active_result_color = color_value("active_result_color") |
49356 | 238 |
val keyword1_color = color_value("keyword1_color") |
239 |
val keyword2_color = color_value("keyword2_color") |
|
55505 | 240 |
val keyword3_color = color_value("keyword3_color") |
55919
2eb8c13339a5
more explicit quasi_keyword markup, for Args.$$$ material, which is somewhere in between of outer and inner syntax;
wenzelm
parents:
55914
diff
changeset
|
241 |
val quasi_keyword_color = color_value("quasi_keyword_color") |
56202 | 242 |
val improper_color = color_value("improper_color") |
56064 | 243 |
val operator_color = color_value("operator_color") |
55713
734ac5709fbe
clarified painting of invisible caret, e.g. focus change due to popup;
wenzelm
parents:
55710
diff
changeset
|
244 |
val caret_invisible_color = color_value("caret_invisible_color") |
55747
bef19c929ba5
more completion rendering: active, semantic, syntactic;
wenzelm
parents:
55746
diff
changeset
|
245 |
val completion_color = color_value("completion_color") |
49356 | 246 |
|
247 |
val tfree_color = color_value("tfree_color") |
|
248 |
val tvar_color = color_value("tvar_color") |
|
249 |
val free_color = color_value("free_color") |
|
250 |
val skolem_color = color_value("skolem_color") |
|
251 |
val bound_color = color_value("bound_color") |
|
252 |
val var_color = color_value("var_color") |
|
253 |
val inner_numeral_color = color_value("inner_numeral_color") |
|
254 |
val inner_quoted_color = color_value("inner_quoted_color") |
|
55033 | 255 |
val inner_cartouche_color = color_value("inner_cartouche_color") |
49356 | 256 |
val inner_comment_color = color_value("inner_comment_color") |
257 |
val dynamic_color = color_value("dynamic_color") |
|
258 |
||
259 |
||
55674 | 260 |
/* completion */ |
261 |
||
56173 | 262 |
def semantic_completion(range: Text.Range): Option[Text.Info[Completion.Semantic]] = |
55690
d73949233c2e
clarified stretch_point_range wrt. UTF-16 surrogates;
wenzelm
parents:
55689
diff
changeset
|
263 |
if (snapshot.is_outdated) None |
d73949233c2e
clarified stretch_point_range wrt. UTF-16 surrogates;
wenzelm
parents:
55689
diff
changeset
|
264 |
else { |
56173 | 265 |
snapshot.select(range, Rendering.semantic_completion_elements, _ => |
55688 | 266 |
{ |
56173 | 267 |
case Completion.Semantic.Info(info) => Some(info) |
55688 | 268 |
case _ => None |
269 |
}).headOption.map(_.info) |
|
55674 | 270 |
} |
55615
bf4bbe72f740
completion of keywords and symbols based on language context;
wenzelm
parents:
55550
diff
changeset
|
271 |
|
56173 | 272 |
def language_context(range: Text.Range): Option[Completion.Language_Context] = |
273 |
snapshot.select(range, Rendering.language_context_elements, _ => |
|
55690
d73949233c2e
clarified stretch_point_range wrt. UTF-16 surrogates;
wenzelm
parents:
55689
diff
changeset
|
274 |
{ |
55828
42ac3cfb89f6
clarified language markup: added "delimited" property;
wenzelm
parents:
55825
diff
changeset
|
275 |
case Text.Info(_, XML.Elem(Markup.Language(language, symbols, antiquotes, delimited), _)) => |
42ac3cfb89f6
clarified language markup: added "delimited" property;
wenzelm
parents:
55825
diff
changeset
|
276 |
if (delimited) Some(Completion.Language_Context(language, symbols, antiquotes)) |
42ac3cfb89f6
clarified language markup: added "delimited" property;
wenzelm
parents:
55825
diff
changeset
|
277 |
else None |
55690
d73949233c2e
clarified stretch_point_range wrt. UTF-16 surrogates;
wenzelm
parents:
55689
diff
changeset
|
278 |
case Text.Info(_, elem) |
d73949233c2e
clarified stretch_point_range wrt. UTF-16 surrogates;
wenzelm
parents:
55689
diff
changeset
|
279 |
if elem.name == Markup.ML_STRING || elem.name == Markup.ML_COMMENT => |
55749 | 280 |
Some(Completion.Language_Context.ML_inner) |
55690
d73949233c2e
clarified stretch_point_range wrt. UTF-16 surrogates;
wenzelm
parents:
55689
diff
changeset
|
281 |
case Text.Info(_, _) => |
55749 | 282 |
Some(Completion.Language_Context.inner) |
55690
d73949233c2e
clarified stretch_point_range wrt. UTF-16 surrogates;
wenzelm
parents:
55689
diff
changeset
|
283 |
}).headOption.map(_.info) |
55615
bf4bbe72f740
completion of keywords and symbols based on language context;
wenzelm
parents:
55550
diff
changeset
|
284 |
|
bf4bbe72f740
completion of keywords and symbols based on language context;
wenzelm
parents:
55550
diff
changeset
|
285 |
|
55626 | 286 |
/* command status overview */ |
49356 | 287 |
|
55647 | 288 |
def overview_limit: Int = options.int("jedit_text_overview_limit") |
49969
72216713733a
further attempts to cope with large files via option jedit_text_overview_limit;
wenzelm
parents:
49827
diff
changeset
|
289 |
|
49356 | 290 |
def overview_color(range: Text.Range): Option[Color] = |
291 |
{ |
|
292 |
if (snapshot.is_outdated) None |
|
293 |
else { |
|
294 |
val results = |
|
56395
0546e036d1c0
more direct warning within persistent Protocol.Status;
wenzelm
parents:
56372
diff
changeset
|
295 |
snapshot.cumulate[List[Markup]](range, Nil, Protocol.liberal_status_elements, _ => |
49356 | 296 |
{ |
56395
0546e036d1c0
more direct warning within persistent Protocol.Status;
wenzelm
parents:
56372
diff
changeset
|
297 |
case (status, Text.Info(_, elem)) => Some(elem.markup :: status) |
55651
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents:
55649
diff
changeset
|
298 |
}, status = true) |
49356 | 299 |
if (results.isEmpty) None |
300 |
else { |
|
56395
0546e036d1c0
more direct warning within persistent Protocol.Status;
wenzelm
parents:
56372
diff
changeset
|
301 |
val status = Protocol.Status.make(results.iterator.flatMap(_.info)) |
49356 | 302 |
|
50895 | 303 |
if (status.is_running) Some(running_color) |
56395
0546e036d1c0
more direct warning within persistent Protocol.Status;
wenzelm
parents:
56372
diff
changeset
|
304 |
else if (status.is_warned) Some(warning_color) |
0546e036d1c0
more direct warning within persistent Protocol.Status;
wenzelm
parents:
56372
diff
changeset
|
305 |
else if (status.is_failed) Some(error_color) |
49356 | 306 |
else if (status.is_unprocessed) Some(unprocessed_color) |
307 |
else None |
|
308 |
} |
|
309 |
} |
|
310 |
} |
|
311 |
||
312 |
||
55626 | 313 |
/* highlighted area */ |
49356 | 314 |
|
49358 | 315 |
def highlight(range: Text.Range): Option[Text.Info[Color]] = |
55651
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents:
55649
diff
changeset
|
316 |
snapshot.select(range, Rendering.highlight_elements, _ => |
55620 | 317 |
{ |
318 |
case info => Some(Text.Info(snapshot.convert(info.range), highlight_color)) |
|
55689 | 319 |
}).headOption.map(_.info) |
49356 | 320 |
|
321 |
||
55626 | 322 |
/* hyperlinks */ |
323 |
||
56458
a8d960baa5c2
simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
wenzelm
parents:
56395
diff
changeset
|
324 |
private def jedit_file(name: String): String = |
a8d960baa5c2
simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
wenzelm
parents:
56395
diff
changeset
|
325 |
if (Path.is_valid(name)) |
a8d960baa5c2
simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
wenzelm
parents:
56395
diff
changeset
|
326 |
PIDE.resources.append(snapshot.node_name.master_dir, Path.explode(name)) |
a8d960baa5c2
simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
wenzelm
parents:
56395
diff
changeset
|
327 |
else name |
a8d960baa5c2
simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
wenzelm
parents:
56395
diff
changeset
|
328 |
|
52980 | 329 |
def hyperlink(range: Text.Range): Option[Text.Info[PIDE.editor.Hyperlink]] = |
49356 | 330 |
{ |
55651
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents:
55649
diff
changeset
|
331 |
snapshot.cumulate[Vector[Text.Info[PIDE.editor.Hyperlink]]]( |
55647 | 332 |
range, Vector.empty, Rendering.hyperlink_elements, _ => |
49356 | 333 |
{ |
56458
a8d960baa5c2
simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
wenzelm
parents:
56395
diff
changeset
|
334 |
case (links, Text.Info(info_range, XML.Elem(Markup.Path(name), _))) => |
a8d960baa5c2
simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
wenzelm
parents:
56395
diff
changeset
|
335 |
val link = PIDE.editor.hyperlink_file(jedit_file(name)) |
55622
ce575c2212fc
clarified markup cumulation order (see also 25306d92f4ad and 0009a6ebc83b), e.g. relevant for completion_context;
wenzelm
parents:
55620
diff
changeset
|
336 |
Some(links :+ Text.Info(snapshot.convert(info_range), link)) |
49356 | 337 |
|
54702
3daeba5130f0
added document antiquotation @{url}, which produces formal markup for LaTeX and PIDE;
wenzelm
parents:
54515
diff
changeset
|
338 |
case (links, Text.Info(info_range, XML.Elem(Markup.Url(name), _))) => |
3daeba5130f0
added document antiquotation @{url}, which produces formal markup for LaTeX and PIDE;
wenzelm
parents:
54515
diff
changeset
|
339 |
val link = PIDE.editor.hyperlink_url(name) |
55622
ce575c2212fc
clarified markup cumulation order (see also 25306d92f4ad and 0009a6ebc83b), e.g. relevant for completion_context;
wenzelm
parents:
55620
diff
changeset
|
340 |
Some(links :+ Text.Info(snapshot.convert(info_range), link)) |
54702
3daeba5130f0
added document antiquotation @{url}, which produces formal markup for LaTeX and PIDE;
wenzelm
parents:
54515
diff
changeset
|
341 |
|
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
342 |
case (links, Text.Info(info_range, XML.Elem(Markup(Markup.ENTITY, props), _))) |
49815 | 343 |
if !props.exists( |
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
344 |
{ case (Markup.KIND, Markup.ML_OPEN) => true |
55837 | 345 |
case (Markup.KIND, Markup.ML_STRUCTURE) => true |
49815 | 346 |
case _ => false }) => |
55883
6f50d445f0e3
recovered position hyperlinks from 65c9968286d5 (NB: "def" position vs. regular one);
wenzelm
parents:
55879
diff
changeset
|
347 |
val opt_link = |
6f50d445f0e3
recovered position hyperlinks from 65c9968286d5 (NB: "def" position vs. regular one);
wenzelm
parents:
55879
diff
changeset
|
348 |
props match { |
6f50d445f0e3
recovered position hyperlinks from 65c9968286d5 (NB: "def" position vs. regular one);
wenzelm
parents:
55879
diff
changeset
|
349 |
case Position.Def_Line_File(line, name) => |
6f50d445f0e3
recovered position hyperlinks from 65c9968286d5 (NB: "def" position vs. regular one);
wenzelm
parents:
55879
diff
changeset
|
350 |
val offset = Position.Def_Offset.unapply(props) getOrElse 0 |
6f50d445f0e3
recovered position hyperlinks from 65c9968286d5 (NB: "def" position vs. regular one);
wenzelm
parents:
55879
diff
changeset
|
351 |
PIDE.editor.hyperlink_source_file(name, line, offset) |
6f50d445f0e3
recovered position hyperlinks from 65c9968286d5 (NB: "def" position vs. regular one);
wenzelm
parents:
55879
diff
changeset
|
352 |
case Position.Def_Id_Offset(id, offset) => |
6f50d445f0e3
recovered position hyperlinks from 65c9968286d5 (NB: "def" position vs. regular one);
wenzelm
parents:
55879
diff
changeset
|
353 |
PIDE.editor.hyperlink_command_id(snapshot, id, offset) |
6f50d445f0e3
recovered position hyperlinks from 65c9968286d5 (NB: "def" position vs. regular one);
wenzelm
parents:
55879
diff
changeset
|
354 |
case _ => None |
6f50d445f0e3
recovered position hyperlinks from 65c9968286d5 (NB: "def" position vs. regular one);
wenzelm
parents:
55879
diff
changeset
|
355 |
} |
6f50d445f0e3
recovered position hyperlinks from 65c9968286d5 (NB: "def" position vs. regular one);
wenzelm
parents:
55879
diff
changeset
|
356 |
opt_link.map(link => (links :+ Text.Info(snapshot.convert(info_range), link))) |
49356 | 357 |
|
55545 | 358 |
case (links, Text.Info(info_range, XML.Elem(Markup(Markup.POSITION, props), _))) => |
55883
6f50d445f0e3
recovered position hyperlinks from 65c9968286d5 (NB: "def" position vs. regular one);
wenzelm
parents:
55879
diff
changeset
|
359 |
val opt_link = |
6f50d445f0e3
recovered position hyperlinks from 65c9968286d5 (NB: "def" position vs. regular one);
wenzelm
parents:
55879
diff
changeset
|
360 |
props match { |
6f50d445f0e3
recovered position hyperlinks from 65c9968286d5 (NB: "def" position vs. regular one);
wenzelm
parents:
55879
diff
changeset
|
361 |
case Position.Line_File(line, name) => |
6f50d445f0e3
recovered position hyperlinks from 65c9968286d5 (NB: "def" position vs. regular one);
wenzelm
parents:
55879
diff
changeset
|
362 |
val offset = Position.Offset.unapply(props) getOrElse 0 |
6f50d445f0e3
recovered position hyperlinks from 65c9968286d5 (NB: "def" position vs. regular one);
wenzelm
parents:
55879
diff
changeset
|
363 |
PIDE.editor.hyperlink_source_file(name, line, offset) |
6f50d445f0e3
recovered position hyperlinks from 65c9968286d5 (NB: "def" position vs. regular one);
wenzelm
parents:
55879
diff
changeset
|
364 |
case Position.Id_Offset(id, offset) => |
6f50d445f0e3
recovered position hyperlinks from 65c9968286d5 (NB: "def" position vs. regular one);
wenzelm
parents:
55879
diff
changeset
|
365 |
PIDE.editor.hyperlink_command_id(snapshot, id, offset) |
6f50d445f0e3
recovered position hyperlinks from 65c9968286d5 (NB: "def" position vs. regular one);
wenzelm
parents:
55879
diff
changeset
|
366 |
case _ => None |
6f50d445f0e3
recovered position hyperlinks from 65c9968286d5 (NB: "def" position vs. regular one);
wenzelm
parents:
55879
diff
changeset
|
367 |
} |
6f50d445f0e3
recovered position hyperlinks from 65c9968286d5 (NB: "def" position vs. regular one);
wenzelm
parents:
55879
diff
changeset
|
368 |
opt_link.map(link => (links :+ Text.Info(snapshot.convert(info_range), link))) |
52889
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents:
52873
diff
changeset
|
369 |
|
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents:
52873
diff
changeset
|
370 |
case _ => None |
55622
ce575c2212fc
clarified markup cumulation order (see also 25306d92f4ad and 0009a6ebc83b), e.g. relevant for completion_context;
wenzelm
parents:
55620
diff
changeset
|
371 |
}) match { case Text.Info(_, _ :+ info) :: _ => Some(info) case _ => None } |
49356 | 372 |
} |
373 |
||
374 |
||
55626 | 375 |
/* active elements */ |
376 |
||
50450
358b6020f8b6
generalized notion of active area, where sendback is just one application;
wenzelm
parents:
50215
diff
changeset
|
377 |
def active(range: Text.Range): Option[Text.Info[XML.Elem]] = |
56354
a6f8c3566560
more direct command states -- merge_results is hardly ever needed;
wenzelm
parents:
56352
diff
changeset
|
378 |
snapshot.select(range, Rendering.active_elements, command_states => |
55620 | 379 |
{ |
380 |
case Text.Info(info_range, elem) => |
|
55623 | 381 |
if (elem.name == Markup.DIALOG) { |
382 |
elem match { |
|
383 |
case Protocol.Dialog(_, serial, _) |
|
56354
a6f8c3566560
more direct command states -- merge_results is hardly ever needed;
wenzelm
parents:
56352
diff
changeset
|
384 |
if !command_states.exists(st => st.results.defined(serial)) => |
55623 | 385 |
Some(Text.Info(snapshot.convert(info_range), elem)) |
386 |
case _ => None |
|
387 |
} |
|
388 |
} |
|
389 |
else Some(Text.Info(snapshot.convert(info_range), elem)) |
|
55689 | 390 |
}).headOption.map(_.info) |
49492 | 391 |
|
50502 | 392 |
def command_results(range: Text.Range): Command.Results = |
56354
a6f8c3566560
more direct command states -- merge_results is hardly ever needed;
wenzelm
parents:
56352
diff
changeset
|
393 |
Command.State.merge_results( |
a6f8c3566560
more direct command states -- merge_results is hardly ever needed;
wenzelm
parents:
56352
diff
changeset
|
394 |
snapshot.select[List[Command.State]](range, Document.Elements.full, command_states => |
a6f8c3566560
more direct command states -- merge_results is hardly ever needed;
wenzelm
parents:
56352
diff
changeset
|
395 |
{ case _ => Some(command_states) }).flatMap(_.info)) |
50502 | 396 |
|
55626 | 397 |
|
398 |
/* tooltip messages */ |
|
399 |
||
51496
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
400 |
def tooltip_message(range: Text.Range): Option[Text.Info[XML.Body]] = |
49356 | 401 |
{ |
51496
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
402 |
val results = |
55651
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents:
55649
diff
changeset
|
403 |
snapshot.cumulate[List[Text.Info[Command.Results.Entry]]]( |
55647 | 404 |
range, Nil, Rendering.tooltip_message_elements, _ => |
51496
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
405 |
{ |
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
406 |
case (msgs, Text.Info(info_range, |
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
407 |
XML.Elem(Markup(name, props @ Markup.Serial(serial)), body))) |
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
408 |
if name == Markup.WRITELN || name == Markup.WARNING || name == Markup.ERROR => |
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
409 |
val entry: Command.Results.Entry = |
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
410 |
(serial -> XML.Elem(Markup(Markup.message(name), props), body)) |
52889
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents:
52873
diff
changeset
|
411 |
Some(Text.Info(snapshot.convert(info_range), entry) :: msgs) |
51496
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
412 |
|
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
413 |
case (msgs, Text.Info(info_range, msg @ XML.Elem(Markup(Markup.BAD, _), body))) |
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
414 |
if !body.isEmpty => |
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52472
diff
changeset
|
415 |
val entry: Command.Results.Entry = (Document_ID.make(), msg) |
52889
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents:
52873
diff
changeset
|
416 |
Some(Text.Info(snapshot.convert(info_range), entry) :: msgs) |
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents:
52873
diff
changeset
|
417 |
|
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents:
52873
diff
changeset
|
418 |
case _ => None |
52900
d29bf6db8a2d
more elementary list structures for markup tree traversal;
wenzelm
parents:
52890
diff
changeset
|
419 |
}).flatMap(_.info) |
51496
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
420 |
if (results.isEmpty) None |
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
421 |
else { |
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
422 |
val r = Text.Range(results.head.range.start, results.last.range.stop) |
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
423 |
val msgs = Command.Results.make(results.map(_.info)) |
56372
fadb0fef09d7
more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents:
56359
diff
changeset
|
424 |
Some(Text.Info(r, Pretty.separate(msgs.iterator.map(_._2).toList))) |
51496
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
425 |
} |
49356 | 426 |
} |
427 |
||
428 |
||
55626 | 429 |
/* tooltips */ |
430 |
||
49700
2d1cbdf6a68b
Rich_Text_Area tooltips via nested Pretty_Text_Area, based on some techniques of FoldViewer plugin;
wenzelm
parents:
49674
diff
changeset
|
431 |
private def pretty_typing(kind: String, body: XML.Body): XML.Tree = |
2d1cbdf6a68b
Rich_Text_Area tooltips via nested Pretty_Text_Area, based on some techniques of FoldViewer plugin;
wenzelm
parents:
49674
diff
changeset
|
432 |
Pretty.block(XML.Text(kind) :: Pretty.Break(1) :: body) |
49356 | 433 |
|
55647 | 434 |
private def timing_threshold: Double = options.real("jedit_timing_threshold") |
51588
167e2d64327a
tooltip of command keyword includes timing information;
wenzelm
parents:
51574
diff
changeset
|
435 |
|
51496
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
436 |
def tooltip(range: Text.Range): Option[Text.Info[XML.Body]] = |
49356 | 437 |
{ |
55622
ce575c2212fc
clarified markup cumulation order (see also 25306d92f4ad and 0009a6ebc83b), e.g. relevant for completion_context;
wenzelm
parents:
55620
diff
changeset
|
438 |
def add(prev: Text.Info[(Timing, Vector[(Boolean, XML.Tree)])], |
ce575c2212fc
clarified markup cumulation order (see also 25306d92f4ad and 0009a6ebc83b), e.g. relevant for completion_context;
wenzelm
parents:
55620
diff
changeset
|
439 |
r0: Text.Range, p: (Boolean, XML.Tree)): Text.Info[(Timing, Vector[(Boolean, XML.Tree)])] = |
51496
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
440 |
{ |
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
441 |
val r = snapshot.convert(r0) |
51588
167e2d64327a
tooltip of command keyword includes timing information;
wenzelm
parents:
51574
diff
changeset
|
442 |
val (t, info) = prev.info |
55622
ce575c2212fc
clarified markup cumulation order (see also 25306d92f4ad and 0009a6ebc83b), e.g. relevant for completion_context;
wenzelm
parents:
55620
diff
changeset
|
443 |
if (prev.range == r) |
ce575c2212fc
clarified markup cumulation order (see also 25306d92f4ad and 0009a6ebc83b), e.g. relevant for completion_context;
wenzelm
parents:
55620
diff
changeset
|
444 |
Text.Info(r, (t, info :+ p)) |
ce575c2212fc
clarified markup cumulation order (see also 25306d92f4ad and 0009a6ebc83b), e.g. relevant for completion_context;
wenzelm
parents:
55620
diff
changeset
|
445 |
else Text.Info(r, (t, Vector(p))) |
51496
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
446 |
} |
49356 | 447 |
|
51496
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
448 |
val results = |
55651
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents:
55649
diff
changeset
|
449 |
snapshot.cumulate[Text.Info[(Timing, Vector[(Boolean, XML.Tree)])]]( |
55647 | 450 |
range, Text.Info(range, (Timing.zero, Vector.empty)), Rendering.tooltip_elements, _ => |
49356 | 451 |
{ |
51588
167e2d64327a
tooltip of command keyword includes timing information;
wenzelm
parents:
51574
diff
changeset
|
452 |
case (Text.Info(r, (t1, info)), Text.Info(_, XML.Elem(Markup.Timing(t2), _))) => |
52889
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents:
52873
diff
changeset
|
453 |
Some(Text.Info(r, (t1 + t2, info))) |
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
454 |
case (prev, Text.Info(r, XML.Elem(Markup.Entity(kind, name), _))) => |
55977 | 455 |
val kind1 = Library.plain_words(kind) |
51588
167e2d64327a
tooltip of command keyword includes timing information;
wenzelm
parents:
51574
diff
changeset
|
456 |
val txt1 = kind1 + " " + quote(name) |
167e2d64327a
tooltip of command keyword includes timing information;
wenzelm
parents:
51574
diff
changeset
|
457 |
val t = prev.info._1 |
167e2d64327a
tooltip of command keyword includes timing information;
wenzelm
parents:
51574
diff
changeset
|
458 |
val txt2 = |
167e2d64327a
tooltip of command keyword includes timing information;
wenzelm
parents:
51574
diff
changeset
|
459 |
if (kind == Markup.COMMAND && t.elapsed.seconds >= timing_threshold) |
167e2d64327a
tooltip of command keyword includes timing information;
wenzelm
parents:
51574
diff
changeset
|
460 |
"\n" + t.message |
167e2d64327a
tooltip of command keyword includes timing information;
wenzelm
parents:
51574
diff
changeset
|
461 |
else "" |
52889
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents:
52873
diff
changeset
|
462 |
Some(add(prev, r, (true, XML.Text(txt1 + txt2)))) |
56458
a8d960baa5c2
simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
wenzelm
parents:
56395
diff
changeset
|
463 |
case (prev, Text.Info(r, XML.Elem(Markup.Path(name), _))) => |
a8d960baa5c2
simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
wenzelm
parents:
56395
diff
changeset
|
464 |
val file = jedit_file(name) |
a8d960baa5c2
simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
wenzelm
parents:
56395
diff
changeset
|
465 |
val text = |
a8d960baa5c2
simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
wenzelm
parents:
56395
diff
changeset
|
466 |
if (name == file) "file " + quote(file) |
a8d960baa5c2
simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
wenzelm
parents:
56395
diff
changeset
|
467 |
else "path " + quote(name) + "\nfile " + quote(file) |
56134 | 468 |
Some(add(prev, r, (true, XML.Text(text)))) |
54702
3daeba5130f0
added document antiquotation @{url}, which produces formal markup for LaTeX and PIDE;
wenzelm
parents:
54515
diff
changeset
|
469 |
case (prev, Text.Info(r, XML.Elem(Markup.Url(name), _))) => |
3daeba5130f0
added document antiquotation @{url}, which produces formal markup for LaTeX and PIDE;
wenzelm
parents:
54515
diff
changeset
|
470 |
Some(add(prev, r, (true, XML.Text("URL " + quote(name))))) |
49674
dbadb4d03cbc
report sort assignment of visible type variables;
wenzelm
parents:
49554
diff
changeset
|
471 |
case (prev, Text.Info(r, XML.Elem(Markup(name, _), body))) |
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
472 |
if name == Markup.SORTING || name == Markup.TYPING => |
52889
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents:
52873
diff
changeset
|
473 |
Some(add(prev, r, (true, pretty_typing("::", body)))) |
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
474 |
case (prev, Text.Info(r, XML.Elem(Markup(Markup.ML_TYPING, _), body))) => |
52889
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents:
52873
diff
changeset
|
475 |
Some(add(prev, r, (false, pretty_typing("ML:", body)))) |
55828
42ac3cfb89f6
clarified language markup: added "delimited" property;
wenzelm
parents:
55825
diff
changeset
|
476 |
case (prev, Text.Info(r, XML.Elem(Markup.Language(language, _, _, _), _))) => |
55615
bf4bbe72f740
completion of keywords and symbols based on language context;
wenzelm
parents:
55550
diff
changeset
|
477 |
Some(add(prev, r, (true, XML.Text("language: " + language)))) |
52889
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents:
52873
diff
changeset
|
478 |
case (prev, Text.Info(r, XML.Elem(Markup(name, _), _))) => |
55647 | 479 |
Rendering.tooltip_descriptions.get(name). |
480 |
map(descr => add(prev, r, (true, XML.Text(descr)))) |
|
52900
d29bf6db8a2d
more elementary list structures for markup tree traversal;
wenzelm
parents:
52890
diff
changeset
|
481 |
}).map(_.info) |
49356 | 482 |
|
55622
ce575c2212fc
clarified markup cumulation order (see also 25306d92f4ad and 0009a6ebc83b), e.g. relevant for completion_context;
wenzelm
parents:
55620
diff
changeset
|
483 |
results.map(_.info).flatMap(res => res._2.toList) match { |
51496
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
484 |
case Nil => None |
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
485 |
case tips => |
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
486 |
val r = Text.Range(results.head.range.start, results.last.range.stop) |
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
487 |
val all_tips = (tips.filter(_._1) ++ tips.filter(!_._1).lastOption.toList).map(_._2) |
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
488 |
Some(Text.Info(r, Library.separate(Pretty.FBreak, all_tips))) |
cb677987b7e3
retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents:
50895
diff
changeset
|
489 |
} |
49356 | 490 |
} |
491 |
||
55647 | 492 |
def tooltip_margin: Int = options.int("jedit_tooltip_margin") |
50554
0493efcc97e9
more general handling of graphics configurations, to increase chance of proper positioning of tooltips in multi-screen environment;
wenzelm
parents:
50547
diff
changeset
|
493 |
|
52873 | 494 |
lazy val tooltip_close_icon = JEdit_Lib.load_icon(options.string("tooltip_close_icon")) |
495 |
lazy val tooltip_detach_icon = JEdit_Lib.load_icon(options.string("tooltip_detach_icon")) |
|
52472
3a43a8b1ecb0
load icons via options -- prefer IntelliJ IDEA for now;
wenzelm
parents:
52471
diff
changeset
|
496 |
|
3a43a8b1ecb0
load icons via options -- prefer IntelliJ IDEA for now;
wenzelm
parents:
52471
diff
changeset
|
497 |
|
55626 | 498 |
/* gutter icons */ |
499 |
||
52472
3a43a8b1ecb0
load icons via options -- prefer IntelliJ IDEA for now;
wenzelm
parents:
52471
diff
changeset
|
500 |
private lazy val gutter_icons = Map( |
52873 | 501 |
Rendering.information_pri -> JEdit_Lib.load_icon(options.string("gutter_information_icon")), |
502 |
Rendering.warning_pri -> JEdit_Lib.load_icon(options.string("gutter_warning_icon")), |
|
503 |
Rendering.legacy_pri -> JEdit_Lib.load_icon(options.string("gutter_legacy_icon")), |
|
504 |
Rendering.error_pri -> JEdit_Lib.load_icon(options.string("gutter_error_icon"))) |
|
49356 | 505 |
|
506 |
def gutter_message(range: Text.Range): Option[Icon] = |
|
507 |
{ |
|
508 |
val results = |
|
55651
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents:
55649
diff
changeset
|
509 |
snapshot.cumulate[Int](range, 0, Rendering.gutter_elements, _ => |
49356 | 510 |
{ |
52644 | 511 |
case (pri, Text.Info(_, XML.Elem(Markup(Markup.WRITELN, _), |
512 |
List(XML.Elem(Markup(Markup.INFORMATION, _), _))))) => |
|
52889
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents:
52873
diff
changeset
|
513 |
Some(pri max Rendering.information_pri) |
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
514 |
case (pri, Text.Info(_, XML.Elem(Markup(Markup.WARNING, _), body))) => |
49356 | 515 |
body match { |
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
516 |
case List(XML.Elem(Markup(Markup.LEGACY, _), _)) => |
52889
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents:
52873
diff
changeset
|
517 |
Some(pri max Rendering.legacy_pri) |
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents:
52873
diff
changeset
|
518 |
case _ => |
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents:
52873
diff
changeset
|
519 |
Some(pri max Rendering.warning_pri) |
49356 | 520 |
} |
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
521 |
case (pri, Text.Info(_, XML.Elem(Markup(Markup.ERROR, _), _))) => |
52889
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents:
52873
diff
changeset
|
522 |
Some(pri max Rendering.error_pri) |
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents:
52873
diff
changeset
|
523 |
case _ => None |
49356 | 524 |
}) |
525 |
val pri = (0 /: results) { case (p1, Text.Info(_, p2)) => p1 max p2 } |
|
52472
3a43a8b1ecb0
load icons via options -- prefer IntelliJ IDEA for now;
wenzelm
parents:
52471
diff
changeset
|
526 |
gutter_icons.get(pri) |
49356 | 527 |
} |
528 |
||
529 |
||
55626 | 530 |
/* squiggly underline */ |
531 |
||
55647 | 532 |
private lazy val squiggly_colors = Map( |
50199
6d04e2422769
quasi-abstract module Rendering, with Isabelle-specific implementation;
wenzelm
parents:
50196
diff
changeset
|
533 |
Rendering.writeln_pri -> writeln_color, |
52650 | 534 |
Rendering.information_pri -> information_color, |
50199
6d04e2422769
quasi-abstract module Rendering, with Isabelle-specific implementation;
wenzelm
parents:
50196
diff
changeset
|
535 |
Rendering.warning_pri -> warning_color, |
6d04e2422769
quasi-abstract module Rendering, with Isabelle-specific implementation;
wenzelm
parents:
50196
diff
changeset
|
536 |
Rendering.error_pri -> error_color) |
49356 | 537 |
|
52900
d29bf6db8a2d
more elementary list structures for markup tree traversal;
wenzelm
parents:
52890
diff
changeset
|
538 |
def squiggly_underline(range: Text.Range): List[Text.Info[Color]] = |
49356 | 539 |
{ |
540 |
val results = |
|
55651
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents:
55649
diff
changeset
|
541 |
snapshot.cumulate[Int](range, 0, Rendering.squiggly_elements, _ => |
49356 | 542 |
{ |
52890 | 543 |
case (pri, Text.Info(_, elem)) => |
544 |
if (Protocol.is_information(elem)) |
|
52889
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents:
52873
diff
changeset
|
545 |
Some(pri max Rendering.information_pri) |
55620 | 546 |
else |
52890 | 547 |
Some(pri max Rendering.message_pri(elem.name)) |
49356 | 548 |
}) |
549 |
for { |
|
550 |
Text.Info(r, pri) <- results |
|
551 |
color <- squiggly_colors.get(pri) |
|
552 |
} yield Text.Info(r, color) |
|
553 |
} |
|
554 |
||
49474 | 555 |
|
55626 | 556 |
/* message output */ |
557 |
||
55647 | 558 |
private lazy val message_colors = Map( |
50199
6d04e2422769
quasi-abstract module Rendering, with Isabelle-specific implementation;
wenzelm
parents:
50196
diff
changeset
|
559 |
Rendering.writeln_pri -> writeln_message_color, |
52650 | 560 |
Rendering.information_pri -> information_message_color, |
50199
6d04e2422769
quasi-abstract module Rendering, with Isabelle-specific implementation;
wenzelm
parents:
50196
diff
changeset
|
561 |
Rendering.tracing_pri -> tracing_message_color, |
6d04e2422769
quasi-abstract module Rendering, with Isabelle-specific implementation;
wenzelm
parents:
50196
diff
changeset
|
562 |
Rendering.warning_pri -> warning_message_color, |
6d04e2422769
quasi-abstract module Rendering, with Isabelle-specific implementation;
wenzelm
parents:
50196
diff
changeset
|
563 |
Rendering.error_pri -> error_message_color) |
49474 | 564 |
|
49473 | 565 |
def line_background(range: Text.Range): Option[(Color, Boolean)] = |
566 |
{ |
|
49474 | 567 |
val results = |
55651
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents:
55649
diff
changeset
|
568 |
snapshot.cumulate[Int](range, 0, Rendering.line_background_elements, _ => |
49473 | 569 |
{ |
52890 | 570 |
case (pri, Text.Info(_, elem)) => |
55623 | 571 |
if (elem.name == Markup.INFORMATION) |
52890 | 572 |
Some(pri max Rendering.information_pri) |
55623 | 573 |
else |
574 |
Some(pri max Rendering.message_pri(elem.name)) |
|
49474 | 575 |
}) |
576 |
val pri = (0 /: results) { case (p1, Text.Info(_, p2)) => p1 max p2 } |
|
577 |
||
55623 | 578 |
val is_separator = |
579 |
pri > 0 && |
|
55651
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents:
55649
diff
changeset
|
580 |
snapshot.cumulate[Boolean](range, false, Rendering.separator_elements, _ => |
49473 | 581 |
{ |
55623 | 582 |
case _ => Some(true) |
49473 | 583 |
}).exists(_.info) |
584 |
||
49474 | 585 |
message_colors.get(pri).map((_, is_separator)) |
49473 | 586 |
} |
49356 | 587 |
|
56299
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents:
56298
diff
changeset
|
588 |
def output_messages(results: Command.Results): List[XML.Tree] = |
56372
fadb0fef09d7
more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents:
56359
diff
changeset
|
589 |
results.iterator.map(_._2).filterNot(Protocol.is_result(_)).toList |
50500
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50499
diff
changeset
|
590 |
|
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50499
diff
changeset
|
591 |
|
55626 | 592 |
/* text background */ |
593 |
||
55790
4670f18baba5
simplified rendering -- no need to over-emphasize "token_range";
wenzelm
parents:
55765
diff
changeset
|
594 |
def background(range: Text.Range): List[Text.Info[Color]] = |
49356 | 595 |
{ |
56176
0bc9b0ad6287
tuned rendering -- avoid flashing background of aux. files that are disconnected from the document model;
wenzelm
parents:
56173
diff
changeset
|
596 |
if (snapshot.is_outdated && snapshot.is_loaded) List(Text.Info(range, outdated_color)) |
49356 | 597 |
else |
598 |
for { |
|
599 |
Text.Info(r, result) <- |
|
56352
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
wenzelm
parents:
56299
diff
changeset
|
600 |
snapshot.cumulate[(List[Markup], Option[Color])]( |
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
wenzelm
parents:
56299
diff
changeset
|
601 |
range, (List(Markup.Empty), None), Rendering.background_elements, |
56354
a6f8c3566560
more direct command states -- merge_results is hardly ever needed;
wenzelm
parents:
56352
diff
changeset
|
602 |
command_states => |
55647 | 603 |
{ |
56352
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
wenzelm
parents:
56299
diff
changeset
|
604 |
case (((status, color), Text.Info(_, XML.Elem(markup, _)))) |
56395
0546e036d1c0
more direct warning within persistent Protocol.Status;
wenzelm
parents:
56372
diff
changeset
|
605 |
if !status.isEmpty && Protocol.proper_status_elements(markup.name) => |
56352
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
wenzelm
parents:
56299
diff
changeset
|
606 |
Some((markup :: status, color)) |
55647 | 607 |
case (_, Text.Info(_, XML.Elem(Markup(Markup.BAD, _), _))) => |
56352
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
wenzelm
parents:
56299
diff
changeset
|
608 |
Some((Nil, Some(bad_color))) |
55647 | 609 |
case (_, Text.Info(_, XML.Elem(Markup(Markup.INTENSIFY, _), _))) => |
56352
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
wenzelm
parents:
56299
diff
changeset
|
610 |
Some((Nil, Some(intensify_color))) |
55647 | 611 |
case (acc, Text.Info(_, Protocol.Dialog(_, serial, result))) => |
56354
a6f8c3566560
more direct command states -- merge_results is hardly ever needed;
wenzelm
parents:
56352
diff
changeset
|
612 |
command_states.collectFirst( |
a6f8c3566560
more direct command states -- merge_results is hardly ever needed;
wenzelm
parents:
56352
diff
changeset
|
613 |
{ case st if st.results.defined(serial) => st.results.get(serial).get }) match |
a6f8c3566560
more direct command states -- merge_results is hardly ever needed;
wenzelm
parents:
56352
diff
changeset
|
614 |
{ |
55647 | 615 |
case Some(Protocol.Dialog_Result(res)) if res == result => |
56352
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
wenzelm
parents:
56299
diff
changeset
|
616 |
Some((Nil, Some(active_result_color))) |
55647 | 617 |
case _ => |
56352
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
wenzelm
parents:
56299
diff
changeset
|
618 |
Some((Nil, Some(active_color))) |
55647 | 619 |
} |
620 |
case (_, Text.Info(_, elem)) => |
|
56352
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
wenzelm
parents:
56299
diff
changeset
|
621 |
if (Rendering.active_elements(elem.name)) Some((Nil, Some(active_color))) |
55647 | 622 |
else None |
623 |
}) |
|
49356 | 624 |
color <- |
625 |
(result match { |
|
56352
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
wenzelm
parents:
56299
diff
changeset
|
626 |
case (markups, opt_color) if !markups.isEmpty => |
56359
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56354
diff
changeset
|
627 |
val status = Protocol.Status.make(markups.iterator) |
49356 | 628 |
if (status.is_unprocessed) Some(unprocessed1_color) |
629 |
else if (status.is_running) Some(running1_color) |
|
630 |
else opt_color |
|
50500
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50499
diff
changeset
|
631 |
case (_, opt_color) => opt_color |
49356 | 632 |
}) |
633 |
} yield Text.Info(r, color) |
|
634 |
} |
|
635 |
||
636 |
||
55626 | 637 |
/* text foreground */ |
51574
2b58d7b139d6
ghost bullet via markup, which is painted as bar under text (normally space);
wenzelm
parents:
51496
diff
changeset
|
638 |
|
52900
d29bf6db8a2d
more elementary list structures for markup tree traversal;
wenzelm
parents:
52890
diff
changeset
|
639 |
def foreground(range: Text.Range): List[Text.Info[Color]] = |
55651
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents:
55649
diff
changeset
|
640 |
snapshot.select(range, Rendering.foreground_elements, _ => |
49356 | 641 |
{ |
52890 | 642 |
case Text.Info(_, elem) => |
55620 | 643 |
if (elem.name == Markup.ANTIQUOTED) Some(antiquoted_color) else Some(quoted_color) |
49356 | 644 |
}) |
645 |
||
646 |
||
55626 | 647 |
/* text color */ |
648 |
||
55647 | 649 |
private lazy val text_colors: Map[String, Color] = Map( |
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
650 |
Markup.KEYWORD1 -> keyword1_color, |
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
651 |
Markup.KEYWORD2 -> keyword2_color, |
55765 | 652 |
Markup.KEYWORD3 -> keyword3_color, |
55919
2eb8c13339a5
more explicit quasi_keyword markup, for Args.$$$ material, which is somewhere in between of outer and inner syntax;
wenzelm
parents:
55914
diff
changeset
|
653 |
Markup.QUASI_KEYWORD -> quasi_keyword_color, |
56202 | 654 |
Markup.IMPROPER -> improper_color, |
56064 | 655 |
Markup.OPERATOR -> operator_color, |
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
656 |
Markup.STRING -> Color.BLACK, |
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
657 |
Markup.ALTSTRING -> Color.BLACK, |
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
658 |
Markup.VERBATIM -> Color.BLACK, |
55514
8ef781e282d9
more uniform rendering of text that is formally interpreted: avoid clash with inner markup;
wenzelm
parents:
55512
diff
changeset
|
659 |
Markup.CARTOUCHE -> Color.BLACK, |
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
660 |
Markup.LITERAL -> keyword1_color, |
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
661 |
Markup.DELIMITER -> Color.BLACK, |
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
662 |
Markup.TFREE -> tfree_color, |
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
663 |
Markup.TVAR -> tvar_color, |
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
664 |
Markup.FREE -> free_color, |
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
665 |
Markup.SKOLEM -> skolem_color, |
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
666 |
Markup.BOUND -> bound_color, |
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
667 |
Markup.VAR -> var_color, |
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
668 |
Markup.INNER_STRING -> inner_quoted_color, |
55033 | 669 |
Markup.INNER_CARTOUCHE -> inner_cartouche_color, |
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
670 |
Markup.INNER_COMMENT -> inner_comment_color, |
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
671 |
Markup.DYNAMIC_FACT -> dynamic_color, |
55526 | 672 |
Markup.ANTIQUOTE -> antiquote_color, |
55505 | 673 |
Markup.ML_KEYWORD1 -> keyword1_color, |
674 |
Markup.ML_KEYWORD2 -> keyword2_color, |
|
675 |
Markup.ML_KEYWORD3 -> keyword3_color, |
|
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
676 |
Markup.ML_DELIMITER -> Color.BLACK, |
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
677 |
Markup.ML_NUMERAL -> inner_numeral_color, |
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
678 |
Markup.ML_CHAR -> inner_quoted_color, |
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50200
diff
changeset
|
679 |
Markup.ML_STRING -> inner_quoted_color, |
56278
2576d3a40ed6
separate tokenization and language context for SML: no symbols, no antiquotes;
wenzelm
parents:
56208
diff
changeset
|
680 |
Markup.ML_COMMENT -> inner_comment_color, |
2576d3a40ed6
separate tokenization and language context for SML: no symbols, no antiquotes;
wenzelm
parents:
56208
diff
changeset
|
681 |
Markup.SML_STRING -> inner_quoted_color, |
2576d3a40ed6
separate tokenization and language context for SML: no symbols, no antiquotes;
wenzelm
parents:
56208
diff
changeset
|
682 |
Markup.SML_COMMENT -> inner_comment_color) |
49356 | 683 |
|
55820
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55790
diff
changeset
|
684 |
private lazy val text_color_elements = |
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55790
diff
changeset
|
685 |
Document.Elements(text_colors.keySet) |
49356 | 686 |
|
52900
d29bf6db8a2d
more elementary list structures for markup tree traversal;
wenzelm
parents:
52890
diff
changeset
|
687 |
def text_color(range: Text.Range, color: Color): List[Text.Info[Color]] = |
49356 | 688 |
{ |
52900
d29bf6db8a2d
more elementary list structures for markup tree traversal;
wenzelm
parents:
52890
diff
changeset
|
689 |
if (color == Token_Markup.hidden_color) List(Text.Info(range, color)) |
50196
94886ebf090f
retain hidden_color (i.e. transparent white) instead of replacing it by semantic text color, to make control symbols more hidden and avoid "dirty" lines with some fonts;
wenzelm
parents:
50164
diff
changeset
|
690 |
else |
55651
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents:
55649
diff
changeset
|
691 |
snapshot.cumulate(range, color, text_color_elements, _ => |
50196
94886ebf090f
retain hidden_color (i.e. transparent white) instead of replacing it by semantic text color, to make control symbols more hidden and avoid "dirty" lines with some fonts;
wenzelm
parents:
50164
diff
changeset
|
692 |
{ |
52890 | 693 |
case (_, Text.Info(_, elem)) => text_colors.get(elem.name) |
50196
94886ebf090f
retain hidden_color (i.e. transparent white) instead of replacing it by semantic text color, to make control symbols more hidden and avoid "dirty" lines with some fonts;
wenzelm
parents:
50164
diff
changeset
|
694 |
}) |
49356 | 695 |
} |
50542
58bd88159f8f
fold handling within Pretty_Text_Area, based on formal document content, which is static here;
wenzelm
parents:
50507
diff
changeset
|
696 |
|
58bd88159f8f
fold handling within Pretty_Text_Area, based on formal document content, which is static here;
wenzelm
parents:
50507
diff
changeset
|
697 |
|
55626 | 698 |
/* virtual bullets */ |
699 |
||
700 |
def bullet(range: Text.Range): List[Text.Info[Color]] = |
|
55651
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents:
55649
diff
changeset
|
701 |
snapshot.select(range, Rendering.bullet_elements, _ => _ => Some(bullet_color)) |
55626 | 702 |
|
703 |
||
704 |
/* text folds */ |
|
50542
58bd88159f8f
fold handling within Pretty_Text_Area, based on formal document content, which is static here;
wenzelm
parents:
50507
diff
changeset
|
705 |
|
52900
d29bf6db8a2d
more elementary list structures for markup tree traversal;
wenzelm
parents:
52890
diff
changeset
|
706 |
def fold_depth(range: Text.Range): List[Text.Info[Int]] = |
55651
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents:
55649
diff
changeset
|
707 |
snapshot.cumulate[Int](range, 0, Rendering.fold_depth_elements, _ => |
50542
58bd88159f8f
fold handling within Pretty_Text_Area, based on formal document content, which is static here;
wenzelm
parents:
50507
diff
changeset
|
708 |
{ |
55620 | 709 |
case (depth, _) => Some(depth + 1) |
50542
58bd88159f8f
fold handling within Pretty_Text_Area, based on formal document content, which is static here;
wenzelm
parents:
50507
diff
changeset
|
710 |
}) |
49356 | 711 |
} |