| author | Claus Gittinger <cg@exept.de> |
| Tue, 17 Jun 2014 13:39:03 +0200 | |
| changeset 14520 | 777b5112f927 |
| parent 14519 | 47d5751883ab |
| child 14521 | 6625c6f46bf3 |
| permissions | -rw-r--r-- |
| 9985 | 1 |
" |
| 10072 | 2 |
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague |
3 |
All Rights Reserved |
|
4 |
||
5 |
Permission is hereby granted, free of charge, to any person |
|
6 |
obtaining a copy of this software and associated documentation |
|
7 |
files (the 'Software'), to deal in the Software without |
|
8 |
restriction, including without limitation the rights to use, |
|
9 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
10 |
copies of the Software, and to permit persons to whom the |
|
11 |
Software is furnished to do so, subject to the following |
|
12 |
conditions: |
|
13 |
||
14 |
The above copyright notice and this permission notice shall be |
|
15 |
included in all copies or substantial portions of the Software. |
|
16 |
||
17 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
18 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
19 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
20 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
21 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
22 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
23 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
24 |
OTHER DEALINGS IN THE SOFTWARE. |
|
| 9985 | 25 |
" |
26 |
"{ Package: 'stx:libtool' }"
|
|
27 |
||
28 |
"{ NameSpace: Tools }"
|
|
29 |
||
30 |
SimpleView subclass:#CodeView2 |
|
|
13975
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
31 |
instanceVariableNames:'gutterView textView textViewScroller methodHolder languageHolder |
|
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
32 |
classHolder browserHolder codeAspect modifiedChannel |
|
14492
feacc657658d
Remove unused instvar (serviceManager) from CodeView2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14447
diff
changeset
|
33 |
showGutterChannel showAcceptCancelBarChannel modeHolder services |
|
feacc657658d
Remove unused instvar (serviceManager) from CodeView2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14447
diff
changeset
|
34 |
servicesFromClient syntaxElements currentParseNodeHolder |
|
feacc657658d
Remove unused instvar (serviceManager) from CodeView2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14447
diff
changeset
|
35 |
currentBlockNodeHolder syntaxElementSelection highlightEmphasis |
|
feacc657658d
Remove unused instvar (serviceManager) from CodeView2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14447
diff
changeset
|
36 |
diffMode synchronizedCodeViews' |
|
13975
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
37 |
classVariableNames:'TraceSelectors' |
|
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
38 |
poolDictionaries:'' |
|
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
39 |
category:'Interface-CodeView' |
| 9985 | 40 |
! |
41 |
||
42 |
SimpleView subclass:#GutterView |
|
|
13975
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
43 |
instanceVariableNames:'codeView textView textViewScroller widthAcceptCancel |
|
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
44 |
widthAnnotations widthDiffInfo numberOfLines acceptColor |
|
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
45 |
cancelColor diffColor menuHolder currentBlockNodeHolder |
|
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
46 |
showLineNumbers' |
|
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
47 |
classVariableNames:'' |
|
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
48 |
poolDictionaries:'' |
|
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
49 |
privateIn:CodeView2 |
| 9985 | 50 |
! |
51 |
||
52 |
CodeView subclass:#TextView |
|
|
13975
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
53 |
instanceVariableNames:'listOriginal codeView gutterView diffMode deletedLines |
|
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
54 |
insertedLines lastFirstLine changedLines scrollInProgress |
|
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
55 |
originDiffText emptyLines changedDiffText suppressNotifications |
|
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
56 |
reallyModifiedChannel' |
|
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
57 |
classVariableNames:'' |
|
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
58 |
poolDictionaries:'' |
|
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
59 |
privateIn:CodeView2 |
| 9985 | 60 |
! |
61 |
||
62 |
!CodeView2 class methodsFor:'documentation'! |
|
63 |
||
64 |
copyright |
|
65 |
" |
|
| 10072 | 66 |
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague |
67 |
All Rights Reserved |
|
68 |
||
69 |
Permission is hereby granted, free of charge, to any person |
|
70 |
obtaining a copy of this software and associated documentation |
|
71 |
files (the 'Software'), to deal in the Software without |
|
72 |
restriction, including without limitation the rights to use, |
|
73 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
74 |
copies of the Software, and to permit persons to whom the |
|
75 |
Software is furnished to do so, subject to the following |
|
76 |
conditions: |
|
77 |
||
78 |
The above copyright notice and this permission notice shall be |
|
79 |
included in all copies or substantial portions of the Software. |
|
80 |
||
81 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
82 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
83 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
84 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
85 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
86 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
87 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
88 |
OTHER DEALINGS IN THE SOFTWARE. |
|
| 9985 | 89 |
" |
90 |
! ! |
|
91 |
||
92 |
!CodeView2 class methodsFor:'initialization'! |
|
93 |
||
94 |
initialize |
|
95 |
"Invoked at system start or when the class is dynamically loaded." |
|
96 |
||
97 |
"/ please change as required (and remove this comment) |
|
98 |
||
99 |
TraceSelectors := IdentitySet new. |
|
100 |
||
101 |
"Modified: / 14-02-2010 / 15:36:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
102 |
! ! |
|
103 |
||
104 |
!CodeView2 class methodsFor:'debugging'! |
|
105 |
||
106 |
trace: aSelector |
|
107 |
||
108 |
TraceSelectors add: aSelector |
|
109 |
||
110 |
"Created: / 14-02-2010 / 09:26:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
111 |
! |
|
112 |
||
113 |
untrace: aSelector |
|
114 |
||
115 |
TraceSelectors remove: aSelector ifAbsent:[] |
|
116 |
||
117 |
"Created: / 14-02-2010 / 09:50:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
118 |
! |
|
119 |
||
120 |
untraceAll |
|
121 |
||
122 |
TraceSelectors := IdentitySet new |
|
123 |
||
124 |
"Created: / 14-02-2010 / 09:53:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
125 |
! ! |
|
126 |
||
127 |
!CodeView2 class methodsFor:'examples'! |
|
128 |
||
129 |
example1 |
|
130 |
||
131 |
| window codeView | |
|
132 |
||
133 |
||
134 |
window := StandardSystemView new. |
|
135 |
window extent: 300 @ 300. |
|
136 |
window label: 'CodeView2 example1'. |
|
137 |
||
138 |
codeView := Tools::CodeView2 in: window. |
|
139 |
codeView |
|
140 |
origin: 0.1 @ 0.1 |
|
141 |
corner: 0.9 @ 0.9. |
|
142 |
||
143 |
||
144 |
window open. |
|
145 |
||
146 |
"Created: / 02-09-2009 / 21:48:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
147 |
! ! |
|
148 |
||
149 |
!CodeView2 class methodsFor:'menu specs'! |
|
150 |
||
| 10293 | 151 |
debugMenu |
152 |
"This resource specification was automatically generated |
|
153 |
by the MenuEditor of ST/X." |
|
154 |
||
155 |
"Do not manually edit this!! If it is corrupted, |
|
156 |
the MenuEditor may not be able to read the specification." |
|
157 |
||
158 |
" |
|
159 |
MenuEditor new openOnClass:Tools::CodeView2 andSelector:#editMenu_stxStyle |
|
160 |
(Menu new fromLiteralArrayEncoding:(Tools::CodeView2 editMenu_stxStyle)) startUp |
|
161 |
" |
|
162 |
||
163 |
<resource: #menu> |
|
164 |
||
165 |
^ |
|
166 |
#(Menu |
|
167 |
( |
|
168 |
(MenuItem |
|
169 |
label: 'Inspect ' |
|
170 |
itemValue: inspectView |
|
171 |
translateLabel: true |
|
172 |
) |
|
173 |
(MenuItem |
|
174 |
label: 'Inspect Syntax Elements' |
|
175 |
itemValue: inspectSyntaxElements |
|
176 |
translateLabel: true |
|
177 |
) |
|
178 |
(MenuItem |
|
|
11398
84d3987c0155
better search (for variables)
Claus Gittinger <cg@exept.de>
parents:
11393
diff
changeset
|
179 |
label: 'Inspect Selected Selector' |
| 10293 | 180 |
itemValue: inspectSelectedSelector |
181 |
translateLabel: true |
|
182 |
) |
|
183 |
) |
|
184 |
nil |
|
185 |
nil |
|
186 |
) |
|
187 |
||
188 |
"Created: / 08-07-2011 / 13:36:02 / cg" |
|
189 |
! |
|
190 |
||
| 9985 | 191 |
editMenu |
192 |
"This resource specification was automatically generated |
|
193 |
by the MenuEditor of ST/X." |
|
194 |
||
195 |
"Do not manually edit this!! If it is corrupted, |
|
196 |
the MenuEditor may not be able to read the specification." |
|
197 |
||
198 |
" |
|
199 |
MenuEditor new openOnClass:Tools::CodeView2 andSelector:#editMenu |
|
200 |
(Menu new fromLiteralArrayEncoding:(Tools::CodeView2 editMenu)) startUp |
|
201 |
" |
|
202 |
||
| 10290 | 203 |
UserPreferences current eclipseStyleMenus ifTrue:[ |
204 |
^ self editMenu_eclipseStyle |
|
205 |
]. |
|
206 |
^ self editMenu_stxStyle |
|
207 |
||
208 |
"Modified: / 08-07-2011 / 13:23:35 / cg" |
|
209 |
! |
|
210 |
||
211 |
editMenu_eclipseStyle |
|
212 |
"This resource specification was automatically generated |
|
213 |
by the MenuEditor of ST/X." |
|
214 |
||
215 |
"Do not manually edit this!! If it is corrupted, |
|
216 |
the MenuEditor may not be able to read the specification." |
|
217 |
||
| 11311 | 218 |
|
| 10290 | 219 |
" |
| 11311 | 220 |
MenuEditor new openOnClass:Tools::CodeView2 andSelector:#editMenu_eclipseStyle |
221 |
(Menu new fromLiteralArrayEncoding:(Tools::CodeView2 editMenu_eclipseStyle)) startUp |
|
| 10290 | 222 |
" |
223 |
||
| 9985 | 224 |
<resource: #menu> |
225 |
||
| 13813 | 226 |
^ |
| 9985 | 227 |
#(Menu |
| 13942 | 228 |
( |
229 |
(MenuItem |
|
230 |
label: 'Implementors...' |
|
231 |
itemValue: browseImplementorsOfIt |
|
232 |
submenuChannel: implementorsMenu |
|
233 |
shortcutKey: ImplementorsOfIt |
|
234 |
) |
|
235 |
(MenuItem |
|
236 |
label: 'Senders...' |
|
237 |
itemValue: browseSendersOfIt |
|
238 |
submenuChannel: sendersMenu |
|
239 |
shortcutKey: SendersOfIt |
|
240 |
) |
|
241 |
(MenuItem |
|
242 |
label: 'Refactor' |
|
243 |
nameKey: refactor |
|
244 |
isVisible: false |
|
245 |
shortcutKey: Shift |
|
246 |
) |
|
247 |
(MenuItem |
|
248 |
label: '-' |
|
249 |
) |
|
250 |
(MenuItem |
|
251 |
label: 'Accept' |
|
252 |
itemValue: accept |
|
253 |
shortcutKey: Accept |
|
254 |
) |
|
255 |
(MenuItem |
|
256 |
label: '-' |
|
257 |
) |
|
258 |
(MenuItem |
|
259 |
label: 'Cut' |
|
260 |
itemValue: cut |
|
261 |
shortcutKey: Cut |
|
262 |
) |
|
263 |
(MenuItem |
|
264 |
label: 'Copy' |
|
265 |
itemValue: copySelection |
|
266 |
shortcutKey: Copy |
|
267 |
) |
|
268 |
(MenuItem |
|
269 |
label: 'Paste' |
|
270 |
itemValue: pasteOrReplace |
|
271 |
shortcutKey: Paste |
|
272 |
) |
|
273 |
(MenuItem |
|
274 |
label: '-' |
|
275 |
) |
|
276 |
(MenuItem |
|
277 |
label: 'Undo' |
|
278 |
itemValue: undo |
|
279 |
shortcutKey: Undo |
|
280 |
) |
|
281 |
(MenuItem |
|
282 |
label: 'Redo' |
|
283 |
itemValue: redo |
|
284 |
shortcutKey: Redo |
|
285 |
) |
|
286 |
(MenuItem |
|
287 |
label: '-' |
|
288 |
) |
|
289 |
(MenuItem |
|
290 |
label: 'Do it' |
|
291 |
itemValue: doIt |
|
292 |
shortcutKey: DoIt |
|
293 |
) |
|
294 |
(MenuItem |
|
295 |
label: 'Print it' |
|
296 |
itemValue: printIt |
|
297 |
shortcutKey: PrintIt |
|
298 |
) |
|
299 |
(MenuItem |
|
300 |
label: 'Inspect it' |
|
301 |
itemValue: inspectIt |
|
302 |
shortcutKey: InspectIt |
|
303 |
) |
|
304 |
(MenuItem |
|
305 |
label: 'Profile it' |
|
306 |
itemValue: profileIt |
|
307 |
shortcutKey: InspectIt |
|
308 |
) |
|
309 |
(MenuItem |
|
310 |
label: '-' |
|
311 |
) |
|
312 |
(MenuItem |
|
313 |
label: 'Show Gutter' |
|
314 |
nameKey: ShowGutter |
|
315 |
indication: showGutterChannel |
|
316 |
) |
|
317 |
(MenuItem |
|
318 |
label: 'More' |
|
319 |
nameKey: More |
|
320 |
) |
|
321 |
(MenuItem |
|
322 |
label: 'Services' |
|
323 |
submenuChannel: servicesMenu |
|
324 |
) |
|
325 |
(MenuItem |
|
326 |
label: 'Debug' |
|
327 |
submenuChannel: debugMenu |
|
328 |
) |
|
329 |
) |
|
330 |
nil |
|
331 |
nil |
|
| 9985 | 332 |
) |
| 10290 | 333 |
! |
334 |
||
335 |
editMenu_stxStyle |
|
336 |
"This resource specification was automatically generated |
|
337 |
by the MenuEditor of ST/X." |
|
338 |
||
339 |
"Do not manually edit this!! If it is corrupted, |
|
340 |
the MenuEditor may not be able to read the specification." |
|
341 |
||
|
11241
e3d6bdc7a790
changed: #editMenu_stxStyle
Claus Gittinger <cg@exept.de>
parents:
11220
diff
changeset
|
342 |
|
| 10290 | 343 |
" |
344 |
MenuEditor new openOnClass:Tools::CodeView2 andSelector:#editMenu_stxStyle |
|
345 |
(Menu new fromLiteralArrayEncoding:(Tools::CodeView2 editMenu_stxStyle)) startUp |
|
346 |
" |
|
347 |
||
348 |
<resource: #menu> |
|
349 |
||
350 |
^ |
|
351 |
#(Menu |
|
352 |
( |
|
353 |
(MenuItem |
|
354 |
label: 'Undo' |
|
355 |
itemValue: undo |
|
356 |
translateLabel: true |
|
357 |
shortcutKey: Undo |
|
358 |
) |
|
359 |
(MenuItem |
|
360 |
label: 'Again' |
|
361 |
itemValue: again |
|
362 |
translateLabel: true |
|
363 |
shortcutKey: Again |
|
364 |
) |
|
365 |
(MenuItem |
|
366 |
label: '-' |
|
367 |
) |
|
368 |
(MenuItem |
|
369 |
label: 'Cut' |
|
370 |
itemValue: cut |
|
371 |
translateLabel: true |
|
372 |
shortcutKey: Cut |
|
373 |
) |
|
374 |
(MenuItem |
|
375 |
label: 'Copy' |
|
376 |
itemValue: copySelection |
|
377 |
translateLabel: true |
|
378 |
shortcutKey: Copy |
|
379 |
) |
|
380 |
(MenuItem |
|
381 |
label: 'Paste' |
|
382 |
itemValue: pasteOrReplace |
|
383 |
translateLabel: true |
|
384 |
shortcutKey: Paste |
|
385 |
) |
|
386 |
(MenuItem |
|
387 |
label: '-' |
|
388 |
) |
|
389 |
(MenuItem |
|
390 |
label: 'DoIt' |
|
391 |
itemValue: doIt |
|
392 |
translateLabel: true |
|
393 |
shortcutKey: DoIt |
|
394 |
) |
|
395 |
(MenuItem |
|
396 |
label: 'PrintIt' |
|
397 |
itemValue: printIt |
|
398 |
translateLabel: true |
|
399 |
shortcutKey: PrintIt |
|
400 |
) |
|
401 |
(MenuItem |
|
402 |
label: 'InspectIt' |
|
403 |
itemValue: inspectIt |
|
404 |
translateLabel: true |
|
405 |
shortcutKey: InspectIt |
|
406 |
) |
|
407 |
(MenuItem |
|
408 |
label: '-' |
|
409 |
) |
|
410 |
(MenuItem |
|
411 |
label: 'Accept' |
|
412 |
itemValue: accept |
|
413 |
translateLabel: true |
|
414 |
shortcutKey: Accept |
|
415 |
) |
|
416 |
(MenuItem |
|
417 |
label: '-' |
|
|
11353
5cb468550ad2
changed: #editMenu_stxStyle
Claus Gittinger <cg@exept.de>
parents:
11311
diff
changeset
|
418 |
isVisible: false |
| 10290 | 419 |
) |
420 |
(MenuItem |
|
421 |
label: 'Refactor' |
|
| 11311 | 422 |
nameKey: refactor |
| 10290 | 423 |
translateLabel: true |
424 |
isVisible: false |
|
425 |
shortcutKey: Shift |
|
426 |
) |
|
427 |
(MenuItem |
|
428 |
label: 'Services' |
|
429 |
translateLabel: true |
|
|
11241
e3d6bdc7a790
changed: #editMenu_stxStyle
Claus Gittinger <cg@exept.de>
parents:
11220
diff
changeset
|
430 |
isVisible: false |
| 10290 | 431 |
submenuChannel: servicesMenu |
432 |
) |
|
433 |
(MenuItem |
|
|
11353
5cb468550ad2
changed: #editMenu_stxStyle
Claus Gittinger <cg@exept.de>
parents:
11311
diff
changeset
|
434 |
label: '=' |
| 10290 | 435 |
) |
436 |
(MenuItem |
|
437 |
label: 'More' |
|
438 |
nameKey: More |
|
439 |
translateLabel: true |
|
440 |
shortcutKey: Ctrl |
|
441 |
) |
|
442 |
) |
|
443 |
nil |
|
444 |
nil |
|
445 |
) |
|
|
11353
5cb468550ad2
changed: #editMenu_stxStyle
Claus Gittinger <cg@exept.de>
parents:
11311
diff
changeset
|
446 |
|
|
5cb468550ad2
changed: #editMenu_stxStyle
Claus Gittinger <cg@exept.de>
parents:
11311
diff
changeset
|
447 |
"Modified: / 02-03-2012 / 19:53:19 / cg" |
| 9985 | 448 |
! ! |
449 |
||
450 |
!CodeView2 methodsFor:'accessing'! |
|
451 |
||
452 |
acceptAction:aBlock |
|
453 |
||
454 |
textView acceptAction: aBlock |
|
455 |
||
456 |
"Modified: / 01-08-2010 / 20:40:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
457 |
! |
|
458 |
||
| 10224 | 459 |
breakpoints |
| 13097 | 460 |
|s| |
461 |
||
462 |
(s := self breakpointService) notNil ifTrue:[ |
|
463 |
^ s breakpoints |
|
| 10224 | 464 |
]. |
| 10767 | 465 |
^ nil |
| 10224 | 466 |
|
467 |
"Created: / 06-07-2011 / 18:05:35 / jv" |
|
| 10767 | 468 |
"Modified: / 06-10-2011 / 14:13:53 / cg" |
| 10224 | 469 |
! |
470 |
||
| 10245 | 471 |
browser |
472 |
||
473 |
^self browserHolder value |
|
474 |
||
475 |
"Created: / 07-07-2011 / 12:25:59 / Jan Vrany <jan.vrant@fit.cvut,cz>" |
|
476 |
! |
|
477 |
||
| 9985 | 478 |
codeAspect |
|
13587
0f06b4a66ae7
Refactoring after moving codeAspect to EditTextView.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13584
diff
changeset
|
479 |
^ textView codeAspect |
|
0f06b4a66ae7
Refactoring after moving codeAspect to EditTextView.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13584
diff
changeset
|
480 |
|
| 11706 | 481 |
"Modified: / 27-07-2012 / 22:22:27 / cg" |
|
13587
0f06b4a66ae7
Refactoring after moving codeAspect to EditTextView.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13584
diff
changeset
|
482 |
"Modified: / 27-09-2013 / 10:01:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 483 |
! |
484 |
||
|
13587
0f06b4a66ae7
Refactoring after moving codeAspect to EditTextView.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13584
diff
changeset
|
485 |
codeAspect: aSymbol |
|
0f06b4a66ae7
Refactoring after moving codeAspect to EditTextView.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13584
diff
changeset
|
486 |
^ textView codeAspect: aSymbol |
| 11706 | 487 |
|
488 |
"Modified: / 27-07-2012 / 22:32:19 / cg" |
|
|
13587
0f06b4a66ae7
Refactoring after moving codeAspect to EditTextView.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13584
diff
changeset
|
489 |
"Modified: / 27-09-2013 / 10:01:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 490 |
! |
491 |
||
| 13813 | 492 |
compilerClass |
493 |
^textView compilerClass |
|
494 |
||
495 |
"Created: / 10-05-2012 / 23:47:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
496 |
! |
|
497 |
||
498 |
compilerClass: aClass |
|
499 |
textView compilerClass: aClass |
|
500 |
||
501 |
"Created: / 10-05-2012 / 23:47:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
502 |
! |
|
503 |
||
| 9985 | 504 |
contents |
505 |
||
506 |
^textView contents |
|
507 |
||
508 |
"Created: / 14-02-2010 / 22:13:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
509 |
! |
|
510 |
||
511 |
contents: aStringOrStringCollection |
|
512 |
||
513 |
textView contents: aStringOrStringCollection. |
|
514 |
"/self update:#value with: aStringOrStringCollection from: textView model |
|
515 |
||
| 10330 | 516 |
"Modified: / 19-07-2011 / 13:18:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 517 |
! |
518 |
||
| 13813 | 519 |
contents: aStringOrStringCollection clear: clearPrevious |
520 |
"Set the contents. If clearPrevous is true, then |
|
521 |
previous original text is cleared and set to given one. |
|
522 |
(so the text is considered not modified)" |
|
523 |
||
524 |
textView contents: aStringOrStringCollection clear: clearPrevious |
|
525 |
||
526 |
"Modified: / 19-07-2011 / 13:18:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
527 |
"Created: / 17-02-2012 / 00:33:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
528 |
! |
|
529 |
||
530 |
currentParseNode |
|
| 14101 | 531 |
|sel| |
532 |
||
533 |
sel := self syntaxElementSelection. |
|
534 |
sel isNil ifTrue:[^ nil]. |
|
535 |
^ sel node |
|
| 13813 | 536 |
|
537 |
"Created: / 21-02-2012 / 14:20:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
|
14057
94bd4556cf5d
Fixes in CodeNavigationService - semi-modal navigation should work again.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14050
diff
changeset
|
538 |
"Modified: / 25-02-2014 / 22:06:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 13813 | 539 |
! |
540 |
||
541 |
delegate: anObject |
|
542 |
||
543 |
super delegate: anObject. |
|
544 |
self textView delegate: anObject. |
|
545 |
self gutterView delegate: anObject. |
|
546 |
||
547 |
"Created: / 11-05-2012 / 10:29:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
548 |
! |
|
549 |
||
| 9985 | 550 |
diffMode |
551 |
^ diffMode |
|
552 |
! |
|
553 |
||
554 |
diffMode:aBoolean |
|
555 |
diffMode := aBoolean. |
|
556 |
textView diffMode: aBoolean |
|
557 |
||
558 |
"Modified: / 08-04-2011 / 20:50:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
559 |
! |
|
560 |
||
|
14194
efb533b63fee
Tools::CodeView2>>#editedLanguage:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14145
diff
changeset
|
561 |
editedLanguage: aProgrammingLanguage |
|
efb533b63fee
Tools::CodeView2>>#editedLanguage:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14145
diff
changeset
|
562 |
self languageHolder value: aProgrammingLanguage |
|
efb533b63fee
Tools::CodeView2>>#editedLanguage:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14145
diff
changeset
|
563 |
|
|
efb533b63fee
Tools::CodeView2>>#editedLanguage:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14145
diff
changeset
|
564 |
"Created: / 09-04-2014 / 14:49:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
efb533b63fee
Tools::CodeView2>>#editedLanguage:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14145
diff
changeset
|
565 |
! |
|
efb533b63fee
Tools::CodeView2>>#editedLanguage:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14145
diff
changeset
|
566 |
|
| 12914 | 567 |
editedMethodOrClass:aMethodOrClass |
| 12950 | 568 |
textView editedMethodOrClass:aMethodOrClass. |
569 |
aMethodOrClass isBehavior ifFalse:[ |
|
570 |
self methodHolder value:aMethodOrClass |
|
571 |
]. |
|
| 12914 | 572 |
! |
573 |
||
| 9985 | 574 |
font |
575 |
||
576 |
^textView font |
|
577 |
||
578 |
"Created: / 16-02-2010 / 10:26:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
579 |
! |
|
580 |
||
581 |
font: aFont |
|
582 |
||
583 |
^textView font: aFont |
|
584 |
||
585 |
"Created: / 16-02-2010 / 10:26:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
586 |
! |
|
587 |
||
588 |
mode |
|
589 |
||
590 |
^self modeHolder value |
|
591 |
||
592 |
"Created: / 13-06-2011 / 10:49:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
593 |
! |
|
594 |
||
595 |
mode: aSymbol |
|
| 11706 | 596 |
"is this the same as codeAspect ?" |
| 9985 | 597 |
|
598 |
self assert: (#(expression method) includes: aSymbol). |
|
599 |
||
600 |
^self modeHolder value: aSymbol |
|
601 |
||
602 |
"Created: / 13-06-2011 / 10:50:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
603 |
"Modified: / 15-06-2011 / 16:37:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11706 | 604 |
"Modified (comment): / 27-07-2012 / 22:19:49 / cg" |
| 9985 | 605 |
! |
606 |
||
| 10409 | 607 |
model |
608 |
||
609 |
^textView model. |
|
610 |
||
611 |
"Created: / 27-07-2011 / 12:47:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
612 |
! |
|
613 |
||
614 |
model: aValueModel |
|
615 |
||
616 |
|oldValue newValue| |
|
617 |
||
618 |
textView model notNil ifTrue:[ |
|
| 13942 | 619 |
oldValue := textView model value. |
620 |
textView model removeDependent:self. |
|
| 10409 | 621 |
]. |
622 |
textView model: aValueModel. |
|
623 |
textView model notNil ifTrue:[ |
|
| 13942 | 624 |
textView model addDependent:self. |
| 10409 | 625 |
]. |
626 |
newValue := textView model value. |
|
627 |
oldValue ~~ newValue ifTrue:[ |
|
| 13942 | 628 |
self update:#value with:newValue from:textView model. |
| 10409 | 629 |
]. |
630 |
||
| 13813 | 631 |
"Modified: / 17-03-2012 / 16:11:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10409 | 632 |
! |
633 |
||
| 9985 | 634 |
modified |
635 |
"return true if text was modified" |
|
636 |
||
| 10245 | 637 |
^ self modifiedChannel value |
638 |
||
639 |
"Modified: / 07-07-2011 / 12:15:43 / Jan Vrany <jan.vrant@fit.cvut,cz>" |
|
| 9985 | 640 |
! |
641 |
||
642 |
modified:aBoolean |
|
643 |
"set/clear the modified flag" |
|
644 |
||
| 10245 | 645 |
self modifiedChannel value:aBoolean |
646 |
||
647 |
"Modified: / 14-02-1997 / 16:44:05 / cg" |
|
648 |
"Modified: / 07-07-2011 / 12:15:39 / Jan Vrany <jan.vrant@fit.cvut,cz>" |
|
| 9985 | 649 |
! |
650 |
||
651 |
scrolledView |
|
652 |
||
653 |
^self |
|
654 |
||
655 |
"Created: / 14-02-2010 / 22:54:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
656 |
! |
|
657 |
||
| 10487 | 658 |
services |
| 10767 | 659 |
^ services ? #() |
| 10487 | 660 |
|
661 |
"Created: / 05-08-2011 / 10:14:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10767 | 662 |
"Modified (format): / 06-10-2011 / 14:11:11 / cg" |
| 10487 | 663 |
! |
664 |
||
| 10755 | 665 |
services:aCollectionOfServices |
666 |
"allow setting of the services (instances); |
|
667 |
this is needed for FileBrowser, to setup a codeView2 without Smalltalk-specific |
|
668 |
services" |
|
669 |
||
|
14495
2507816f2ee1
Fix in Tools::CodeView2>>#services: - when setting services
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14492
diff
changeset
|
670 |
services notEmptyOrNil ifTrue:[ |
|
2507816f2ee1
Fix in Tools::CodeView2>>#services: - when setting services
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14492
diff
changeset
|
671 |
services do:[:service | service unregister ]. |
|
2507816f2ee1
Fix in Tools::CodeView2>>#services: - when setting services
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14492
diff
changeset
|
672 |
services := #(). |
|
2507816f2ee1
Fix in Tools::CodeView2>>#services: - when setting services
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14492
diff
changeset
|
673 |
]. |
| 10767 | 674 |
servicesFromClient := true. |
675 |
services := aCollectionOfServices. |
|
|
14495
2507816f2ee1
Fix in Tools::CodeView2>>#services: - when setting services
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14492
diff
changeset
|
676 |
services notEmptyOrNil ifTrue:[ |
|
2507816f2ee1
Fix in Tools::CodeView2>>#services: - when setting services
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14492
diff
changeset
|
677 |
services do:[:service | service registerIn: self ]. |
|
2507816f2ee1
Fix in Tools::CodeView2>>#services: - when setting services
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14492
diff
changeset
|
678 |
]. |
| 10767 | 679 |
|
680 |
"Created: / 06-10-2011 / 14:15:36 / cg" |
|
|
14495
2507816f2ee1
Fix in Tools::CodeView2>>#services: - when setting services
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14492
diff
changeset
|
681 |
"Modified: / 13-06-2014 / 14:12:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10755 | 682 |
! |
683 |
||
|
14519
47d5751883ab
Added Tools::CodeView2>>#servicesFromClient
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14511
diff
changeset
|
684 |
servicesFromClient |
|
47d5751883ab
Added Tools::CodeView2>>#servicesFromClient
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14511
diff
changeset
|
685 |
^ servicesFromClient ? false |
|
47d5751883ab
Added Tools::CodeView2>>#servicesFromClient
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14511
diff
changeset
|
686 |
|
|
47d5751883ab
Added Tools::CodeView2>>#servicesFromClient
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14511
diff
changeset
|
687 |
"Modified: / 17-06-2014 / 10:22:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
47d5751883ab
Added Tools::CodeView2>>#servicesFromClient
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14511
diff
changeset
|
688 |
! |
|
47d5751883ab
Added Tools::CodeView2>>#servicesFromClient
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14511
diff
changeset
|
689 |
|
|
10793
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
690 |
showAcceptCancelBar |
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
691 |
|
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
692 |
^showAcceptCancelBarChannel value |
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
693 |
|
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
694 |
"Created: / 10-10-2011 / 16:25:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
695 |
! |
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
696 |
|
| 9985 | 697 |
showGutter |
698 |
||
699 |
^showGutterChannel value |
|
700 |
||
701 |
"Created: / 23-06-2010 / 19:37:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
702 |
! |
|
703 |
||
704 |
synchronizeWith: aCodeView |
|
705 |
||
706 |
self assert: aCodeView ~= self. |
|
707 |
(synchronizedCodeViews includes: aCodeView) ifTrue:[^self]. |
|
708 |
synchronizedCodeViews := synchronizedCodeViews copyWith: aCodeView. |
|
709 |
||
710 |
"Created: / 06-04-2010 / 14:13:14 / Jakub <zelenja7@fel.cvut.cz>" |
|
711 |
"Modified: / 23-06-2010 / 17:01:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 13813 | 712 |
! |
713 |
||
714 |
unsynchronizeWith: aCodeView |
|
715 |
||
716 |
self assert: aCodeView ~= self. |
|
717 |
(synchronizedCodeViews includes: aCodeView) ifFalse:[^self]. |
|
718 |
synchronizedCodeViews := synchronizedCodeViews copyWithout: aCodeView. |
|
719 |
||
720 |
"Created: / 06-04-2010 / 14:13:14 / Jakub <zelenja7@fel.cvut.cz>" |
|
721 |
"Modified: / 23-06-2010 / 17:01:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
722 |
"Created: / 19-03-2012 / 14:25:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 9985 | 723 |
! ! |
724 |
||
|
14050
39037498b7e1
class: Tools::CodeView2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14005
diff
changeset
|
725 |
!CodeView2 methodsFor:'accessing-behavior'! |
|
39037498b7e1
class: Tools::CodeView2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14005
diff
changeset
|
726 |
|
|
39037498b7e1
class: Tools::CodeView2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14005
diff
changeset
|
727 |
readOnly:aBoolean |
|
39037498b7e1
class: Tools::CodeView2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14005
diff
changeset
|
728 |
"ignored here; present for compatibility with some textView subclasses, |
|
39037498b7e1
class: Tools::CodeView2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14005
diff
changeset
|
729 |
so that UIPainter can handle it in its TextView spec (which contains a |
|
39037498b7e1
class: Tools::CodeView2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14005
diff
changeset
|
730 |
readOnly field)" |
|
39037498b7e1
class: Tools::CodeView2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14005
diff
changeset
|
731 |
|
|
39037498b7e1
class: Tools::CodeView2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14005
diff
changeset
|
732 |
super readOnly:aBoolean. |
|
39037498b7e1
class: Tools::CodeView2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14005
diff
changeset
|
733 |
textView readOnly: aBoolean. |
|
39037498b7e1
class: Tools::CodeView2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14005
diff
changeset
|
734 |
gutterView readOnly: aBoolean. |
|
39037498b7e1
class: Tools::CodeView2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14005
diff
changeset
|
735 |
|
|
39037498b7e1
class: Tools::CodeView2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14005
diff
changeset
|
736 |
"Created: / 21-02-2014 / 11:45:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
39037498b7e1
class: Tools::CodeView2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14005
diff
changeset
|
737 |
! ! |
|
39037498b7e1
class: Tools::CodeView2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
14005
diff
changeset
|
738 |
|
| 14005 | 739 |
!CodeView2 methodsFor:'accessing-code component'! |
| 10409 | 740 |
|
741 |
klass |
|
742 |
| v | |
|
743 |
||
744 |
(v := self classHolder value) notNil ifTrue:[^v]. |
|
| 13199 | 745 |
(v := self method) notNil ifTrue:[^v mclass]. |
| 10409 | 746 |
|
| 13813 | 747 |
^nil |
| 10409 | 748 |
|
749 |
"Created: / 27-07-2011 / 13:14:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 13199 | 750 |
"Modified: / 22-07-2013 / 13:34:05 / cg" |
| 14005 | 751 |
! |
| 10409 | 752 |
|
753 |
klass: aClass |
|
754 |
||
755 |
"Created: / 27-07-2011 / 13:13:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
756 |
! |
|
757 |
||
758 |
language |
|
759 |
"return the value in 'languageHolder'" |
|
760 |
||
761 |
| v | |
|
762 |
||
763 |
(v := self languageHolder value) notNil ifTrue:[^v]. |
|
| 13199 | 764 |
(v := self method) notNil ifTrue:[^v programmingLanguage]. |
| 10409 | 765 |
(v := self classHolder value) notNil ifTrue:[^v programmingLanguage]. |
766 |
||
|
10967
8c142eff5641
No highlighting by default (either method or language must be set)
vrany
parents:
10877
diff
changeset
|
767 |
"/No, no default language, please. |
|
8c142eff5641
No highlighting by default (either method or language must be set)
vrany
parents:
10877
diff
changeset
|
768 |
"/^SmalltalkLanguage instance |
|
8c142eff5641
No highlighting by default (either method or language must be set)
vrany
parents:
10877
diff
changeset
|
769 |
^nil |
|
8c142eff5641
No highlighting by default (either method or language must be set)
vrany
parents:
10877
diff
changeset
|
770 |
|
|
8c142eff5641
No highlighting by default (either method or language must be set)
vrany
parents:
10877
diff
changeset
|
771 |
"Modified: / 07-12-2011 / 16:38:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 13199 | 772 |
"Modified: / 22-07-2013 / 13:34:17 / cg" |
| 10409 | 773 |
! |
774 |
||
775 |
language: newValue |
|
776 |
"set the value in 'languageHolder'" |
|
777 |
||
778 |
self languageHolder value: newValue |
|
779 |
! |
|
780 |
||
781 |
method |
|
782 |
||
783 |
^self methodHolder value |
|
784 |
||
785 |
"Created: / 27-07-2011 / 13:12:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
786 |
! |
|
787 |
||
788 |
method: aMethod |
|
789 |
||
790 |
^self methodHolder value: aMethod |
|
791 |
||
792 |
"Created: / 27-07-2011 / 13:12:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
793 |
! ! |
|
794 |
||
| 9985 | 795 |
!CodeView2 methodsFor:'aspects'! |
796 |
||
797 |
browserHolder |
|
| 10877 | 798 |
browserHolder isNil ifTrue:[ |
| 9985 | 799 |
browserHolder := ValueHolder new |
800 |
]. |
|
801 |
^browserHolder |
|
802 |
||
803 |
"Modified: / 14-02-2010 / 19:27:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10877 | 804 |
"Modified: / 18-11-2011 / 14:58:15 / cg" |
| 9985 | 805 |
! |
806 |
||
807 |
browserHolder:aValueModel |
|
808 |
browserHolder := aValueModel. |
|
809 |
! |
|
810 |
||
811 |
classHolder |
|
812 |
"return/create the 'classHolder' value holder (automatically generated)" |
|
813 |
||
814 |
classHolder isNil ifTrue:[ |
|
| 10409 | 815 |
classHolder := ValueHolder with: nil. |
| 9985 | 816 |
classHolder addDependent:self. |
817 |
]. |
|
818 |
^ classHolder |
|
819 |
||
| 10409 | 820 |
"Modified: / 27-07-2011 / 13:15:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 821 |
! |
822 |
||
823 |
classHolder:aValueModel |
|
824 |
"set the 'classHolder' value holder (automatically generated)" |
|
825 |
||
826 |
|old oldValue newValue| |
|
827 |
||
828 |
classHolder notNil ifTrue:[ |
|
829 |
oldValue := classHolder value. |
|
830 |
classHolder removeDependent:self. |
|
831 |
]. |
|
832 |
classHolder := aValueModel. |
|
833 |
classHolder notNil ifTrue:[ |
|
834 |
classHolder addDependent:self. |
|
835 |
]. |
|
836 |
old := methodHolder. |
|
837 |
newValue := classHolder value. |
|
838 |
oldValue ~~ newValue ifTrue:[ |
|
839 |
self update:#value with:newValue from:classHolder. |
|
840 |
]. |
|
841 |
||
842 |
self changed: #classHolder with: old -> classHolder |
|
843 |
||
844 |
"Modified: / 17-06-2011 / 12:56:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
845 |
! |
|
846 |
||
| 13813 | 847 |
currentBlockNodeHolder |
848 |
"return/create the 'currentBlockNodeHolder' value holder (automatically generated)" |
|
849 |
||
850 |
currentBlockNodeHolder isNil ifTrue:[ |
|
| 13942 | 851 |
currentBlockNodeHolder := ValueHolder new. |
| 13813 | 852 |
]. |
853 |
^ currentBlockNodeHolder |
|
854 |
! |
|
855 |
||
856 |
currentBlockNodeHolder:something |
|
857 |
"set the 'currentBlockNodeHolder' value holder (automatically generated)" |
|
858 |
||
859 |
currentBlockNodeHolder := something. |
|
860 |
! |
|
861 |
||
862 |
currentParseNodeHolder |
|
863 |
"return/create the 'currentParseNodeHolder' value holder (automatically generated)" |
|
864 |
||
865 |
currentParseNodeHolder isNil ifTrue:[ |
|
| 13942 | 866 |
currentParseNodeHolder := ValueHolder new. |
| 13813 | 867 |
]. |
868 |
^ currentParseNodeHolder |
|
869 |
! |
|
870 |
||
871 |
currentParseNodeHolder:something |
|
872 |
"set the 'currentParseNodeHolder' value holder (automatically generated)" |
|
873 |
||
874 |
currentParseNodeHolder := something. |
|
875 |
gutterView notNil ifTrue:[ gutterView currentBlockNodeHolder: currentBlockNodeHolder ]. |
|
876 |
||
877 |
"Modified: / 16-02-2012 / 23:11:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
878 |
! |
|
879 |
||
| 9985 | 880 |
languageHolder |
881 |
languageHolder isNil ifTrue:[ |
|
| 11616 | 882 |
"/ cg: I dont like the smalltalk default here, because everyone who is not showing ST-code (expecco, filebrowser etc.) |
| 10723 | 883 |
"/ has to explicitely clear the valueholder. I guess, it is better for the few |
884 |
"/ others to explicitely set it, if they do not provide syntaxHighlighter per method |
|
885 |
"/ or class. |
|
886 |
languageHolder := ValueHolder with: nil "SmalltalkLanguage instance". |
|
| 9985 | 887 |
languageHolder addDependent:self. |
888 |
]. |
|
889 |
^ languageHolder |
|
| 10723 | 890 |
|
| 11616 | 891 |
"Modified: / 19-07-2012 / 16:51:04 / cg" |
| 9985 | 892 |
! |
893 |
||
894 |
languageHolder:aValueModel |
|
895 |
"set the 'languageHolder' value holder (automatically generated)" |
|
896 |
||
897 |
|old oldValue newValue| |
|
898 |
||
899 |
languageHolder notNil ifTrue:[ |
|
900 |
oldValue := languageHolder value. |
|
901 |
languageHolder removeDependent:self. |
|
902 |
]. |
|
903 |
languageHolder := aValueModel. |
|
904 |
languageHolder notNil ifTrue:[ |
|
905 |
languageHolder addDependent:self. |
|
906 |
]. |
|
907 |
old := languageHolder. |
|
908 |
newValue := languageHolder value. |
|
909 |
oldValue ~~ newValue ifTrue:[ |
|
910 |
self update:#value with:newValue from:languageHolder. |
|
911 |
]. |
|
912 |
||
913 |
self changed: #languageHolder with: old -> languageHolder |
|
914 |
||
915 |
"Modified: / 17-06-2011 / 12:56:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11616 | 916 |
"Modified: / 19-07-2012 / 16:51:08 / cg" |
| 9985 | 917 |
! |
918 |
||
919 |
methodHolder |
|
920 |
"return/create the 'methodHolder' value holder (automatically generated)" |
|
921 |
||
922 |
methodHolder isNil ifTrue:[ |
|
923 |
methodHolder := ValueHolder new. |
|
924 |
methodHolder addDependent:self. |
|
925 |
]. |
|
926 |
^ methodHolder |
|
927 |
! |
|
928 |
||
929 |
methodHolder:aValueModel |
|
930 |
"set the 'methodHolder' value holder (automatically generated)" |
|
931 |
||
932 |
|old oldValue newValue| |
|
933 |
||
934 |
methodHolder notNil ifTrue:[ |
|
935 |
oldValue := methodHolder value. |
|
936 |
methodHolder removeDependent:self. |
|
937 |
]. |
|
938 |
old := methodHolder. |
|
939 |
methodHolder := aValueModel. |
|
940 |
methodHolder notNil ifTrue:[ |
|
941 |
methodHolder addDependent:self. |
|
942 |
]. |
|
943 |
newValue := methodHolder value. |
|
944 |
oldValue ~~ newValue ifTrue:[ |
|
945 |
self update:#value with:newValue from:methodHolder. |
|
946 |
]. |
|
947 |
||
948 |
self changed: #methodHolder with: old -> methodHolder |
|
949 |
||
950 |
"Modified: / 17-06-2011 / 12:55:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
951 |
! |
|
952 |
||
953 |
modeHolder |
|
954 |
"return/create the 'modeHolder' value holder (automatically generated)" |
|
955 |
||
| 11706 | 956 |
"is this the codeAspect?" |
| 9985 | 957 |
modeHolder isNil ifTrue:[ |
958 |
modeHolder := #expression asValue. |
|
959 |
modeHolder addDependent:self. |
|
960 |
]. |
|
961 |
^ modeHolder |
|
962 |
||
963 |
"Modified: / 13-06-2011 / 10:52:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11706 | 964 |
"Modified (comment): / 27-07-2012 / 22:22:19 / cg" |
| 9985 | 965 |
! |
966 |
||
967 |
modeHolder:something |
|
968 |
"set the 'modeHolder' value holder (automatically generated)" |
|
969 |
||
970 |
|oldValue newValue| |
|
971 |
||
972 |
modeHolder notNil ifTrue:[ |
|
973 |
oldValue := modeHolder value. |
|
974 |
modeHolder removeDependent:self. |
|
975 |
]. |
|
976 |
modeHolder := something. |
|
977 |
modeHolder notNil ifTrue:[ |
|
978 |
modeHolder addDependent:self. |
|
979 |
]. |
|
980 |
newValue := modeHolder value. |
|
981 |
oldValue ~~ newValue ifTrue:[ |
|
982 |
self update:#value with:newValue from:modeHolder. |
|
983 |
]. |
|
984 |
||
985 |
self changed: #modeHolder with: modeHolder |
|
986 |
||
987 |
"Modified: / 17-06-2011 / 12:55:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
988 |
! ! |
|
989 |
||
990 |
!CodeView2 methodsFor:'change & update'! |
|
991 |
||
992 |
update:aspect with:param from:sender |
|
|
13587
0f06b4a66ae7
Refactoring after moving codeAspect to EditTextView.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13584
diff
changeset
|
993 |
|
|
0f06b4a66ae7
Refactoring after moving codeAspect to EditTextView.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13584
diff
changeset
|
994 |
|
|
0f06b4a66ae7
Refactoring after moving codeAspect to EditTextView.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13584
diff
changeset
|
995 |
sender == methodHolder ifTrue:[ |
| 13942 | 996 |
textView editedMethodOrClass: methodHolder value. |
|
13587
0f06b4a66ae7
Refactoring after moving codeAspect to EditTextView.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13584
diff
changeset
|
997 |
]. |
|
0f06b4a66ae7
Refactoring after moving codeAspect to EditTextView.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13584
diff
changeset
|
998 |
|
|
0f06b4a66ae7
Refactoring after moving codeAspect to EditTextView.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13584
diff
changeset
|
999 |
sender == classHolder ifTrue:[ |
| 13942 | 1000 |
methodHolder value isNil ifTrue:[ |
1001 |
textView editedMethodOrClass: classHolder value. |
|
1002 |
]. |
|
|
13587
0f06b4a66ae7
Refactoring after moving codeAspect to EditTextView.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13584
diff
changeset
|
1003 |
]. |
|
0f06b4a66ae7
Refactoring after moving codeAspect to EditTextView.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13584
diff
changeset
|
1004 |
|
|
0f06b4a66ae7
Refactoring after moving codeAspect to EditTextView.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13584
diff
changeset
|
1005 |
sender == languageHolder ifTrue:[ |
| 13942 | 1006 |
textView editedLanguage: languageHolder value. |
| 13813 | 1007 |
]. |
1008 |
||
1009 |
sender == modeHolder ifTrue:[ |
|
| 13942 | 1010 |
codeAspect := modeHolder value |
|
13587
0f06b4a66ae7
Refactoring after moving codeAspect to EditTextView.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13584
diff
changeset
|
1011 |
]. |
| 9985 | 1012 |
|
| 10245 | 1013 |
sender == showGutterChannel ifTrue: [ |
| 13942 | 1014 |
self updateGutterVisibility. |
1015 |
^self. |
|
| 10245 | 1016 |
]. |
| 9985 | 1017 |
|
| 13813 | 1018 |
services do:[:each | |
| 13942 | 1019 |
each isEnabled ifTrue:[ |
1020 |
each update:aspect with:param from:sender |
|
1021 |
] |
|
|
10662
4d67f850e4f7
comment/format in: #update:with:from:
Claus Gittinger <cg@exept.de>
parents:
10630
diff
changeset
|
1022 |
]. |
| 9985 | 1023 |
|
1024 |
super update:aspect with:param from:sender |
|
1025 |
||
| 10245 | 1026 |
"Modified: / 07-07-2011 / 12:07:04 / Jan Vrany <jan.vrant@fit.cvut,cz>" |
| 10767 | 1027 |
"Modified: / 06-10-2011 / 14:14:36 / cg" |
|
13587
0f06b4a66ae7
Refactoring after moving codeAspect to EditTextView.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13584
diff
changeset
|
1028 |
"Modified: / 27-09-2013 / 10:16:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 1029 |
! |
1030 |
||
| 12950 | 1031 |
updateGutter |
1032 |
||
1033 |
self showGutterChannel value ifTrue:[ |
|
1034 |
gutterView invalidate. |
|
1035 |
] |
|
1036 |
||
1037 |
"Created: / 23-06-2010 / 19:05:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1038 |
! |
|
1039 |
||
| 9985 | 1040 |
updateGutterVisibility |
1041 |
||
1042 |
self showGutterChannel value ifTrue:[ |
|
1043 |
textViewScroller origin:(gutterView width @ 0.0) corner:(1.0 @ 1.0). |
|
1044 |
gutterView beVisible. |
|
1045 |
] ifFalse:[ |
|
1046 |
textViewScroller origin:(0.0 @ 0.0) corner:(1.0 @ 1.0). |
|
1047 |
gutterView beInvisible. |
|
1048 |
] |
|
1049 |
||
1050 |
"Created: / 23-06-2010 / 19:05:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1051 |
! ! |
|
1052 |
||
1053 |
!CodeView2 methodsFor:'channels'! |
|
1054 |
||
1055 |
modifiedChannel |
|
1056 |
"return the valueHolder holding true if text was modified" |
|
1057 |
||
| 10245 | 1058 |
^ textView modifiedChannel |
1059 |
"/ ^ modifiedChannel |
|
1060 |
||
1061 |
"Modified: / 07-07-2011 / 12:07:26 / Jan Vrany <jan.vrant@fit.cvut,cz>" |
|
| 9985 | 1062 |
! |
1063 |
||
1064 |
modifiedChannel:aValueHolder |
|
1065 |
"set the valueHolder holding true if text was modified" |
|
1066 |
||
|
10662
4d67f850e4f7
comment/format in: #update:with:from:
Claus Gittinger <cg@exept.de>
parents:
10630
diff
changeset
|
1067 |
textView modifiedChannel removeDependent:self. |
|
4d67f850e4f7
comment/format in: #update:with:from:
Claus Gittinger <cg@exept.de>
parents:
10630
diff
changeset
|
1068 |
textView modifiedChannel:aValueHolder. |
|
4d67f850e4f7
comment/format in: #update:with:from:
Claus Gittinger <cg@exept.de>
parents:
10630
diff
changeset
|
1069 |
textView modifiedChannel addDependent:self. |
| 10245 | 1070 |
|
1071 |
"/ |prev| |
|
1072 |
"/ |
|
1073 |
"/ prev := modifiedChannel. |
|
1074 |
"/ modifiedChannel := aValueHolder. |
|
1075 |
"/ self setupChannel:aValueHolder for:nil withOld:prev |
|
1076 |
||
1077 |
"Created: / 30-01-1998 / 14:51:32 / cg" |
|
1078 |
"Modified: / 07-07-2011 / 12:07:43 / Jan Vrany <jan.vrant@fit.cvut,cz>" |
|
|
10662
4d67f850e4f7
comment/format in: #update:with:from:
Claus Gittinger <cg@exept.de>
parents:
10630
diff
changeset
|
1079 |
"Modified: / 05-09-2011 / 05:13:27 / cg" |
| 9985 | 1080 |
! |
1081 |
||
| 10785 | 1082 |
reallyModifiedChannel |
1083 |
"return the valueHolder holding true if text was modified" |
|
1084 |
||
1085 |
^ textView reallyModifiedChannel |
|
1086 |
||
1087 |
"Modified: / 07-07-2011 / 12:07:26 / Jan Vrany <jan.vrant@fit.cvut,cz>" |
|
1088 |
"Created: / 08-10-2011 / 12:47:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1089 |
! |
|
1090 |
||
1091 |
reallyModifiedChannel: aValueModel |
|
1092 |
||
1093 |
^ textView reallyModifiedChannel: aValueModel |
|
1094 |
||
1095 |
"Modified: / 07-07-2011 / 12:07:26 / Jan Vrany <jan.vrant@fit.cvut,cz>" |
|
1096 |
"Created: / 08-10-2011 / 12:47:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1097 |
! |
|
1098 |
||
|
10793
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
1099 |
showAcceptCancelBarChannel |
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
1100 |
|
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
1101 |
^showAcceptCancelBarChannel |
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
1102 |
|
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
1103 |
"Created: / 10-10-2011 / 16:23:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
1104 |
! |
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
1105 |
|
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
1106 |
showAcceptCancelBarChannel:aValueHolder |
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
1107 |
"set the valueHolder holding true if text was modified" |
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
1108 |
|
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
1109 |
|prev| |
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
1110 |
|
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
1111 |
prev := showAcceptCancelBarChannel. |
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
1112 |
showAcceptCancelBarChannel := aValueHolder. |
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
1113 |
self setupChannel:aValueHolder for:nil withOld:prev. |
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
1114 |
|
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
1115 |
"Created: / 10-10-2011 / 16:24:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
1116 |
! |
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
1117 |
|
| 9985 | 1118 |
showGutterChannel |
1119 |
||
1120 |
^showGutterChannel |
|
1121 |
||
1122 |
"Created: / 23-06-2010 / 19:02:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1123 |
! |
|
1124 |
||
1125 |
showGutterChannel:aValueHolder |
|
1126 |
"set the valueHolder holding true if text was modified" |
|
1127 |
||
1128 |
|prev| |
|
1129 |
||
1130 |
prev := showGutterChannel. |
|
1131 |
showGutterChannel := aValueHolder. |
|
1132 |
self setupChannel:aValueHolder for:nil withOld:prev |
|
1133 |
||
1134 |
"Created: / 23-06-2010 / 19:03:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1135 |
! ! |
|
1136 |
||
| 10262 | 1137 |
!CodeView2 methodsFor:'code services'! |
1138 |
||
1139 |
browseMethod: method |
|
1140 |
||
1141 |
self browseMethod: method label: nil. |
|
1142 |
||
1143 |
"Created: / 14-02-2010 / 19:41:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1144 |
! |
|
1145 |
||
1146 |
browseMethod: method label: label |
|
1147 |
||
| 10877 | 1148 |
self browser isNil ifTrue: [^NewSystemBrowser openInMethod:method]. |
| 10262 | 1149 |
(UserPreferences current alwaysOpenNewTabWhenCtrlClick |
1150 |
or:[self browser navigationState modified]) |
|
1151 |
ifTrue: |
|
1152 |
[self browser |
|
1153 |
spawnFullBrowserInClass: method mclass |
|
1154 |
selector:method selector |
|
1155 |
in:#newBuffer] |
|
1156 |
ifFalse: |
|
1157 |
[self browser |
|
1158 |
switchToClass: method containingClass |
|
1159 |
selector: method selector]. |
|
1160 |
||
1161 |
"Modified: / 19-02-2008 / 10:15:17 / janfrog" |
|
1162 |
"Created: / 19-10-2008 / 08:16:17 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1163 |
"Modified: / 25-07-2010 / 13:34:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10877 | 1164 |
"Modified: / 18-11-2011 / 14:58:12 / cg" |
| 10262 | 1165 |
! |
1166 |
||
1167 |
browseMethods: methods label: label |
|
1168 |
||
1169 |
methods size = 1 ifTrue: |
|
1170 |
[^self browseMethod: methods anyOne label: label]. |
|
1171 |
||
1172 |
self browser |
|
1173 |
ifNil: [NewSystemBrowser browseMethods: methods title: label] |
|
1174 |
ifNotNil:[self browser spawnMethodBrowserFor:methods in:#newBuffer label:label] |
|
1175 |
||
1176 |
"Created: / 26-12-2007 / 11:32:04 / janfrog" |
|
1177 |
"Modified: / 19-10-2008 / 08:17:28 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1178 |
! |
|
1179 |
||
1180 |
extractSelectorAndSelectedTextFrom: givenSelectedText |
|
1181 |
| selector selectedText compilerClass na | |
|
| 11359 | 1182 |
|
| 10262 | 1183 |
selectedText := givenSelectedText. |
1184 |
compilerClass := self language compilerClass. |
|
1185 |
selectedText size > 0 ifTrue:[ |
|
| 11359 | 1186 |
"/ self windowGroup withWaitCursorDo:[ |
| 10262 | 1187 |
"/ hack, for now and expecco; must ask the Parser eventually... |
1188 |
(compilerClass notNil and:[compilerClass includesBehavior:JavaScriptParser]) ifTrue:[ |
|
1189 |
"/ selector is in one piece anyway |
|
1190 |
(selectedText includes:$_) ifFalse:[ |
|
1191 |
"/ zero or one args - sigh (need to parse more to figure this out) |
|
1192 |
selector := JavaScriptParser basicNew translatedSmalltalkSelectorFor:selectedText numArgs:1. |
|
1193 |
selectedText := JavaScriptParser basicNew translatedSmalltalkSelectorFor:selectedText numArgs:0. |
|
1194 |
] ifTrue:[ |
|
1195 |
"/ count _#s plus one arg - sigh |
|
1196 |
na := (selectedText occurrencesOf:$_) + 1. |
|
1197 |
selector := JavaScriptParser basicNew translatedSmalltalkSelectorFor:selectedText numArgs:na |
|
1198 |
]. |
|
1199 |
] ifFalse:[ |
|
1200 |
selector := SystemBrowser extractSelectorFrom:selectedText. |
|
1201 |
]. |
|
| 11359 | 1202 |
"/ ] |
| 10262 | 1203 |
]. |
1204 |
^Array with: selector with: selectedText |
|
1205 |
||
1206 |
"Created: / 30-06-2011 / 19:49:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11359 | 1207 |
"Modified: / 05-03-2012 / 09:04:12 / cg" |
| 10262 | 1208 |
! |
1209 |
||
1210 |
implementorsOf: selector |
|
1211 |
||
| 10877 | 1212 |
selector isNil ifTrue:[^#()]. |
| 10262 | 1213 |
^SystemBrowser |
1214 |
findImplementorsOf: selector |
|
1215 |
in: Smalltalk allClasses |
|
1216 |
ignoreCase: false |
|
1217 |
||
1218 |
"Created: / 26-12-2007 / 11:37:11 / janfrog" |
|
| 10877 | 1219 |
"Modified: / 18-11-2011 / 14:58:17 / cg" |
| 10262 | 1220 |
! |
1221 |
||
1222 |
sendersOf: selector |
|
| 12868 | 1223 |
|senderBlock| |
| 10262 | 1224 |
|
| 10877 | 1225 |
selector isNil ifTrue:[^#()]. |
|
14447
10f98c40548b
fixed ALT-right click (senders of selector under cursor)
az
parents:
14439
diff
changeset
|
1226 |
selector knownAsSymbol ifFalse:[^#()]. |
| 12868 | 1227 |
|
1228 |
"/ not exact, but much faster (looks for symbol only, does not parse code for real send) |
|
|
14447
10f98c40548b
fixed ALT-right click (senders of selector under cursor)
az
parents:
14439
diff
changeset
|
1229 |
senderBlock := SystemBrowser searchBlockForSymbol:selector asSymbol. |
| 12868 | 1230 |
senderBlock == false ifTrue:[ ^ #() ]. |
1231 |
||
1232 |
^ SystemBrowser |
|
| 13942 | 1233 |
allMethodsIn:Smalltalk allClasses |
1234 |
where:senderBlock. |
|
| 13813 | 1235 |
|
1236 |
"/ exact, but much slower |
|
| 12868 | 1237 |
"/ ^SystemBrowser |
1238 |
"/ findSendersOf: selector |
|
1239 |
"/ in: Smalltalk allClasses |
|
1240 |
"/ ignoreCase: false |
|
| 10262 | 1241 |
|
1242 |
"Created: / 26-12-2007 / 11:37:22 / janfrog" |
|
1243 |
"Modified: / 30-06-2011 / 19:32:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10877 | 1244 |
"Modified: / 18-11-2011 / 14:58:19 / cg" |
|
14447
10f98c40548b
fixed ALT-right click (senders of selector under cursor)
az
parents:
14439
diff
changeset
|
1245 |
"Modified: / 04-06-2014 / 11:10:47 / az" |
| 10262 | 1246 |
! ! |
1247 |
||
| 9985 | 1248 |
!CodeView2 methodsFor:'delegation'! |
1249 |
||
1250 |
doesNotUnderstand: aMessage |
|
1251 |
||
1252 |
((textView respondsTo: aMessage selector) |
|
1253 |
and:[(TraceSelectors includes:aMessage selector) not]) |
|
1254 |
ifTrue:[^aMessage sendTo: textView]. |
|
1255 |
^super doesNotUnderstand: aMessage |
|
1256 |
||
1257 |
"Created: / 13-02-2010 / 23:27:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1258 |
"Modified: / 14-02-2010 / 09:53:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1259 |
! |
|
1260 |
||
1261 |
hasSelection |
|
1262 |
||
1263 |
^textView hasSelection |
|
1264 |
||
1265 |
"Created: / 14-02-2010 / 09:53:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1266 |
! ! |
|
1267 |
||
| 11393 | 1268 |
!CodeView2 methodsFor:'delegation-drawing'! |
| 9985 | 1269 |
|
1270 |
drawLine:lineNo in: view atX:x y:y width: w height:h from:startCol to:endColOrNil with:fg and:bg |
|
1271 |
"See the comment in |
|
1272 |
CodeViewService>>drawLine:in:atX..." |
|
1273 |
||
1274 |
services do:[:each| |
|
1275 |
each drawLine:lineNo in: view atX:x y:y width: w height:h from:startCol to:endColOrNil with:fg and:bg |
|
1276 |
] |
|
1277 |
||
1278 |
"Created: / 17-06-2011 / 13:50:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10767 | 1279 |
"Modified: / 06-10-2011 / 14:14:04 / cg" |
| 9985 | 1280 |
! |
1281 |
||
1282 |
redrawVisibleLine: visLineNr |
|
1283 |
||
1284 |
"Created: / 07-03-2010 / 14:44:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1285 |
! |
|
1286 |
||
1287 |
redrawVisibleLine:visLine col:colNr |
|
1288 |
||
1289 |
"Modified: / 05-11-2007 / 17:35:53 / cg" |
|
1290 |
"Modified: / 07-03-2010 / 14:45:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1291 |
! |
|
1292 |
||
1293 |
redrawVisibleLine:visLine from:startCol |
|
1294 |
||
1295 |
"Modified: / 07-03-2010 / 14:46:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1296 |
! |
|
1297 |
||
1298 |
redrawVisibleLine:visLine from:startCol to:endCol |
|
1299 |
||
1300 |
"Modified: / 07-03-2010 / 14:46:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1301 |
! ! |
|
1302 |
||
| 11393 | 1303 |
!CodeView2 methodsFor:'delegation-events'! |
| 9985 | 1304 |
|
1305 |
buttonMotion: button x:x y:y in: view |
|
1306 |
"Delegates events to services. Answers true iff at least |
|
1307 |
one service handler method returns true. In that case, |
|
1308 |
the event is is NOT processes by the view." |
|
1309 |
||
| 12868 | 1310 |
^ services |
1311 |
contains:[:service | |
|
1312 |
service isEnabled and:[ ((service buttonMotion: button x:x y:y in: view) == true) ] |
|
1313 |
]. |
|
| 9985 | 1314 |
|
1315 |
"Modified: / 07-03-2010 / 13:53:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10767 | 1316 |
"Modified: / 06-10-2011 / 14:13:57 / cg" |
| 9985 | 1317 |
! |
1318 |
||
| 14005 | 1319 |
buttonPress: button x:x y:y in: view |
1320 |
"Delegates events to services. Answers true iff at least |
|
1321 |
one service handler method returns true. In that case, |
|
1322 |
the event is is NOT processes by the view." |
|
1323 |
||
1324 |
^ services |
|
1325 |
contains:[:service | |
|
1326 |
service isEnabled and:[ ((service buttonPress: button x:x y:y in: view) == true) ] |
|
1327 |
]. |
|
1328 |
||
1329 |
"Modified: / 07-03-2010 / 13:53:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1330 |
"Modified: / 06-10-2011 / 14:14:00 / cg" |
|
1331 |
"Modified (format): / 05-03-2012 / 08:56:02 / cg" |
|
1332 |
! |
|
1333 |
||
| 12868 | 1334 |
buttonRelease: button x:x y:y in: view |
| 9985 | 1335 |
"Delegates events to services. Answers true iff at least |
1336 |
one service handler method returns true. In that case, |
|
1337 |
the event is is NOT processes by the view." |
|
1338 |
||
| 12868 | 1339 |
^ services |
1340 |
contains:[:service | |
|
1341 |
service isEnabled and:[ ((service buttonRelease: button x:x y:y in: view) == true) ] |
|
1342 |
]. |
|
1343 |
! |
|
1344 |
||
| 12992 | 1345 |
highlightInstanceVariable:name |
1346 |
services do:[:each| |
|
1347 |
each highlightInstanceVariable:name |
|
1348 |
]. |
|
1349 |
! |
|
1350 |
||
| 12868 | 1351 |
keyPress: key x:x y:y in: view |
1352 |
"Delegates events to services. Answers true iff at least |
|
1353 |
one service handler method returns true. In that case, |
|
1354 |
the event is is NOT processes by the view." |
|
1355 |
||
1356 |
^ services |
|
1357 |
contains:[:service | |
|
| 13582 | 1358 |
|handledByService| |
1359 |
||
1360 |
handledByService := service isEnabled |
|
1361 |
and:[ ((service keyPress: key x:x y:y in: view) == true)]. |
|
1362 |
"/ handledByService ifTrue:[ Transcript showCR:'handled by ',service printString ]. |
|
1363 |
handledByService |
|
| 12868 | 1364 |
]. |
| 9985 | 1365 |
|
1366 |
"Modified: / 07-03-2010 / 13:54:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10767 | 1367 |
"Modified: / 06-10-2011 / 14:14:11 / cg" |
| 9985 | 1368 |
! |
1369 |
||
1370 |
keyRelease: key x:x y:y in: view |
|
1371 |
"Delegates events to services. Answers true iff at least |
|
1372 |
one service handler method returns true. In that case, |
|
1373 |
the event is is NOT processes by the view." |
|
1374 |
||
| 12868 | 1375 |
^ services |
1376 |
contains:[:service | |
|
1377 |
service isEnabled and:[ ((service keyRelease: key x:x y:y in: view) == true) ] |
|
1378 |
]. |
|
| 9985 | 1379 |
|
1380 |
"Modified: / 07-03-2010 / 13:54:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10767 | 1381 |
"Modified: / 06-10-2011 / 14:14:13 / cg" |
| 9985 | 1382 |
! |
1383 |
||
| 10224 | 1384 |
linesDeletedFrom: start to: end |
1385 |
||
1386 |
services do: [:each | |
|
1387 |
each isEnabled ifTrue: [ |
|
1388 |
each linesDeletedFrom: start to: end |
|
1389 |
] |
|
1390 |
]. |
|
1391 |
||
1392 |
"Created: / 06-07-2011 / 17:12:54 / jv" |
|
| 10767 | 1393 |
"Modified: / 06-10-2011 / 14:14:16 / cg" |
| 10781 | 1394 |
"Modified: / 07-10-2011 / 19:14:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10224 | 1395 |
! |
1396 |
||
1397 |
linesInsertedFrom: start to: end |
|
1398 |
||
1399 |
services do: [:each | |
|
1400 |
each isEnabled ifTrue: [ |
|
1401 |
each linesInsertedFrom: start to: end |
|
1402 |
] |
|
1403 |
]. |
|
1404 |
||
1405 |
"Created: / 06-07-2011 / 17:12:48 / jv" |
|
| 10767 | 1406 |
"Modified: / 06-10-2011 / 14:14:20 / cg" |
| 10224 | 1407 |
! |
1408 |
||
1409 |
linesModifiedFrom: start to: end |
|
1410 |
||
1411 |
services do: [:each | |
|
1412 |
each isEnabled ifTrue: [ |
|
1413 |
each linesModifiedFrom: start to: end |
|
1414 |
] |
|
1415 |
]. |
|
1416 |
||
1417 |
"Created: / 06-07-2011 / 17:12:58 / jv" |
|
| 10767 | 1418 |
"Modified: / 06-10-2011 / 14:13:44 / cg" |
| 10224 | 1419 |
! |
1420 |
||
| 9985 | 1421 |
scrollDown: nLines in: view |
1422 |
||
1423 |
view == textView |
|
1424 |
ifTrue: |
|
1425 |
["/my text view scrolled... |
|
1426 |
synchronizedCodeViews do:[:codeView|codeView scrollDown: nLines in: view]] |
|
1427 |
ifFalse: |
|
1428 |
["/other code view scrolls and I'm notified about that |
|
1429 |
textView basicScrollDown: nLines] |
|
1430 |
||
1431 |
"Created: / 06-04-2010 / 14:02:39 / Jakub <zelenja7@fel.cvut.cz>" |
|
1432 |
! |
|
1433 |
||
| 14005 | 1434 |
scrollTo:origin redraw:doRedraw in: view |
1435 |
view == textView ifTrue: [ |
|
1436 |
"/my text view scrolled... |
|
1437 |
synchronizedCodeViews do:[:codeView| |
|
1438 |
codeView scrollTo:origin redraw:doRedraw in: view. |
|
1439 |
] |
|
1440 |
] ifFalse: [ |
|
1441 |
"/other code view scrolls and I'm notified about that |
|
1442 |
textView basicScrollTo:origin redraw:doRedraw. |
|
1443 |
] |
|
1444 |
||
1445 |
"Created: / 06-04-2010 / 14:02:39 / Jakub <zelenja7@fel.cvut.cz>" |
|
1446 |
"Created: / 19-03-2012 / 17:05:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1447 |
! |
|
1448 |
||
| 9985 | 1449 |
scrollUp: nLines in: view |
1450 |
||
1451 |
view == textView |
|
1452 |
ifTrue: |
|
1453 |
["/my text view scrolled... |
|
1454 |
synchronizedCodeViews do:[:codeView|codeView scrollUp: nLines in: view]] |
|
1455 |
ifFalse: |
|
1456 |
["/other code view scrolls and I'm notified about that |
|
1457 |
textView basicScrollUp: nLines] |
|
1458 |
||
1459 |
"Created: / 06-04-2010 / 14:02:39 / Jakub <zelenja7@fel.cvut.cz>" |
|
1460 |
! ! |
|
1461 |
||
1462 |
!CodeView2 methodsFor:'diff mode'! |
|
1463 |
||
1464 |
recomputeDiff:view |
|
1465 |
|t1 t2 pom diffHelper view2| |
|
1466 |
||
1467 |
t1 := view getNewOriginText. |
|
1468 |
synchronizedCodeViews do:[:codeView | |
|
1469 |
view2 := codeView |
|
1470 |
]. |
|
1471 |
view changedDiffText:false. |
|
1472 |
view2 changedDiffText:false. |
|
1473 |
t2 := view2 getNewOriginText. |
|
1474 |
pom := DiffCodeView2 new. |
|
1475 |
(view == textView) ifTrue:[ |
|
1476 |
diffHelper := pom computeDiffDataForText1:t1 text2:t2. |
|
1477 |
(view) contents:(diffHelper text1). |
|
1478 |
(view) deletedLines:(diffHelper deleted). |
|
1479 |
(view) changedLines:(diffHelper changed). |
|
1480 |
(view) originDiffText:t1. |
|
1481 |
(view) emptyLines:(diffHelper inserted). |
|
1482 |
(view) changedLines:(diffHelper changed). |
|
1483 |
(view2) contents:(diffHelper text2). |
|
1484 |
(view2) insertedLines:(diffHelper inserted). |
|
1485 |
(view2) changedLines:(diffHelper changed). |
|
1486 |
(view2) originDiffText:t2. |
|
1487 |
(view2) emptyLines:(diffHelper deleted). |
|
1488 |
]. |
|
1489 |
||
1490 |
"Modified: / 22-06-2010 / 23:35:41 / Jakub <zelenja7@fel.cvut.cz>" |
|
1491 |
"Modified: / 23-06-2010 / 17:25:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1492 |
! ! |
|
1493 |
||
1494 |
!CodeView2 methodsFor:'initialization'! |
|
1495 |
||
| 13208 | 1496 |
defaultServices |
1497 |
"/ used to call "CodeViewService availableServices", |
|
1498 |
"/ which enumerated all subclasses. |
|
1499 |
"/ this is BAD BAD BAD, because it does not allow for additional service |
|
1500 |
"/ subclasses to be built for special applications. For example, |
|
1501 |
"/ a debugging breakpoint service for a GDB application, a breakpoint service for |
|
1502 |
"/ expecco's codeview. |
|
1503 |
||
1504 |
"/ therefore, the list of services to use in codeView2 is now filtered |
|
1505 |
||
1506 |
^ CodeViewService availableServices |
|
1507 |
select:[:service | service isUsefulFor:self] |
|
1508 |
||
1509 |
"Created: / 22-07-2013 / 13:57:40 / cg" |
|
1510 |
! |
|
1511 |
||
| 9985 | 1512 |
initialize |
1513 |
"Invoked when a new instance is created." |
|
1514 |
"Call super initialize" |
|
| 13813 | 1515 |
|
| 9985 | 1516 |
super initialize. |
1517 |
"Now set up some visual properties" |
|
1518 |
self level:-1. |
|
1519 |
"Now initialize sub-views" |
|
|
11988
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
1520 |
showGutterChannel := ValueHolder with: true. |
| 13813 | 1521 |
showGutterChannel addDependent: self. |
|
11988
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
1522 |
"/ toDo: I don't like two options in the settings; |
|
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
1523 |
"/ showAcceptCancelBarChannel := (ValueHolder with: (UserPreferences current showAcceptCancelBarInBrowser)). |
|
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
1524 |
showAcceptCancelBarChannel := ValueHolder with: (UserPreferences current codeView2ShowAcceptCancel). |
|
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
1525 |
|
|
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
1526 |
"/ these views must be created first, as they refer to each other's channels in their |
|
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
1527 |
"/ initialize methods |
|
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
1528 |
gutterView := CodeView2::GutterView new. |
|
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
1529 |
textViewScroller := HVScrollableView for: CodeView2::TextView in: self. |
|
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
1530 |
textView := textViewScroller scrolledView. |
|
10793
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
1531 |
|
| 9985 | 1532 |
self initializeGutterView. |
1533 |
self initializeTextView. |
|
1534 |
textView setCodeView:self. |
|
| 13813 | 1535 |
modifiedChannel := ValueHolder with:false. |
| 9985 | 1536 |
diffMode := false. |
1537 |
synchronizedCodeViews := #(). |
|
| 13813 | 1538 |
currentParseNodeHolder := ValueHolder new. |
1539 |
currentBlockNodeHolder := ValueHolder new. |
|
| 10767 | 1540 |
|
1541 |
servicesFromClient := false. |
|
| 9985 | 1542 |
services := OrderedCollection new. |
| 10834 | 1543 |
self initializeServices. |
| 9985 | 1544 |
|
1545 |
"Modified: / 14-12-2009 / 13:59:53 / Jindra <a>" |
|
1546 |
"Modified: / 06-04-2010 / 13:56:35 / Jakub <zelenja7@fel.cvut.cz>" |
|
| 10767 | 1547 |
"Modified: / 06-10-2011 / 14:15:48 / cg" |
| 13813 | 1548 |
"Modified: / 16-02-2012 / 23:05:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 1549 |
! |
1550 |
||
1551 |
initializeGutterView |
|
1552 |
||
|
11988
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
1553 |
gutterView setCodeView:self. |
| 13993 | 1554 |
gutterView currentBlockNodeHolder: self currentBlockNodeHolder. |
| 13316 | 1555 |
gutterView origin:(0.0 @ 0.0) corner:(gutterView preferredWidth+1 @ 1.0). |
| 9985 | 1556 |
showGutterChannel value ifTrue:[self addSubView: gutterView]. |
1557 |
||
1558 |
"Created: / 02-09-2009 / 21:35:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1559 |
"Modified: / 23-06-2010 / 19:14:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1560 |
! |
|
1561 |
||
1562 |
initializeServices |
|
1563 |
| serviceClasses | |
|
| 10409 | 1564 |
|
| 10755 | 1565 |
"/ only do it, if the services have not yet been defined by the user of this view |
1566 |
"/ (FileBrowser does not want Smalltalk-specific services) |
|
| 10767 | 1567 |
servicesFromClient ifFalse:[ |
| 13942 | 1568 |
serviceClasses := self defaultServices sort:[:a :b|a priority = b priority ifTrue:[a name < b name] ifFalse:[a priority > b priority]]. |
1569 |
serviceClasses do:[:cls| |
|
1570 |
self registerService: cls new |
|
1571 |
]. |
|
| 10755 | 1572 |
]. |
| 9985 | 1573 |
|
| 13208 | 1574 |
"Modified: / 22-07-2013 / 14:02:59 / cg" |
| 13813 | 1575 |
"Modified: / 24-07-2013 / 11:56:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 1576 |
! |
1577 |
||
1578 |
initializeTextView |
|
|
11988
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
1579 |
"Initialize textView. gutterView has to be already initialized!!" |
|
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
1580 |
|
| 9985 | 1581 |
textViewScroller |
1582 |
origin: ((self showGutter ifTrue:[gutterView width] ifFalse:[0.0]) @ 0.0) |
|
1583 |
corner: 1.0@1.0; |
|
1584 |
level: 0. |
|
1585 |
textView level: 0. |
|
1586 |
||
1587 |
textView modifiedChannel addDependent: self. |
|
1588 |
||
1589 |
"Created: / 02-09-2009 / 21:36:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1590 |
"Modified: / 23-06-2010 / 19:38:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1591 |
! ! |
|
1592 |
||
1593 |
!CodeView2 methodsFor:'menu actions'! |
|
1594 |
||
| 10689 | 1595 |
accept |
1596 |
textView accept |
|
1597 |
||
1598 |
"Created: / 07-09-2011 / 21:29:07 / cg" |
|
1599 |
! |
|
1600 |
||
| 10375 | 1601 |
again |
1602 |
textView again |
|
1603 |
||
1604 |
"Created: / 16-02-2010 / 19:36:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1605 |
"Created: / 22-07-2011 / 17:44:31 / cg" |
|
1606 |
! |
|
1607 |
||
| 9985 | 1608 |
browseImplementorsOfIt |
| 10262 | 1609 |
|
1610 |
textView browseImplementorsOfIt |
|
1611 |
||
1612 |
"Modified: / 30-06-2011 / 19:22:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 9985 | 1613 |
! |
1614 |
||
1615 |
browseSendersOfIt |
|
| 10262 | 1616 |
|
1617 |
textView browseSendersOfIt |
|
1618 |
||
1619 |
"Modified: / 30-06-2011 / 19:22:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 9985 | 1620 |
! |
1621 |
||
1622 |
copySelection |
|
1623 |
||
1624 |
textView copySelection |
|
1625 |
||
1626 |
"Created: / 16-02-2010 / 19:36:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1627 |
! |
|
1628 |
||
1629 |
cut |
|
1630 |
||
1631 |
textView cut |
|
1632 |
||
1633 |
"Created: / 16-02-2010 / 19:36:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1634 |
! |
|
1635 |
||
1636 |
doIt |
|
1637 |
||
1638 |
textView doIt |
|
1639 |
||
1640 |
"Modified: / 16-02-2010 / 19:38:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1641 |
! |
|
1642 |
||
1643 |
inspectIt |
|
1644 |
||
1645 |
textView inspectIt |
|
1646 |
||
1647 |
"Modified: / 16-02-2010 / 19:38:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1648 |
! |
|
1649 |
||
1650 |
inspectSelectedSelector |
|
1651 |
||
1652 |
self error: 'Not yet implemented' |
|
1653 |
||
1654 |
"Modified: / 14-02-2010 / 15:58:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1655 |
! |
|
1656 |
||
1657 |
inspectSyntaxElements |
|
1658 |
||
1659 |
syntaxElements inspect |
|
1660 |
||
1661 |
"Modified: / 14-02-2010 / 15:57:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1662 |
! |
|
1663 |
||
1664 |
inspectView |
|
1665 |
||
1666 |
self inspect |
|
1667 |
||
1668 |
"Modified: / 25-03-2010 / 17:58:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1669 |
! |
|
1670 |
||
1671 |
pasteOrReplace |
|
1672 |
||
1673 |
textView pasteOrReplace |
|
1674 |
||
1675 |
"Created: / 16-02-2010 / 19:37:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1676 |
! |
|
1677 |
||
1678 |
printIt |
|
1679 |
||
1680 |
textView printIt |
|
1681 |
||
1682 |
"Modified: / 16-02-2010 / 19:38:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1683 |
! |
|
1684 |
||
1685 |
profileIt |
|
1686 |
||
1687 |
textView profileIt |
|
1688 |
||
1689 |
"Created: / 27-08-2010 / 22:12:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1690 |
! |
|
1691 |
||
1692 |
undo |
|
1693 |
||
1694 |
textView undo |
|
1695 |
||
1696 |
"Created: / 16-02-2010 / 19:35:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1697 |
! ! |
|
1698 |
||
1699 |
!CodeView2 methodsFor:'menus-dynamic'! |
|
1700 |
||
| 13108 | 1701 |
debugMenu |
1702 |
^ self class debugMenu decodeAsLiteralArray |
|
1703 |
receiver:self. |
|
1704 |
! |
|
1705 |
||
| 9985 | 1706 |
editMenu |
| 10780 | 1707 |
| editMenu superEditMenu moreMenu moreMenuItem | |
1708 |
||
1709 |
superEditMenu := textView superEditMenu. |
|
1710 |
||
1711 |
textView sensor ctrlDown ifTrue:[ |
|
1712 |
^superEditMenu |
|
1713 |
]. |
|
| 10293 | 1714 |
|
| 13072 | 1715 |
"/ install the standard 'more' menu into my own menu |
1716 |
moreMenu := superEditMenu subMenuAt: superEditMenu numberOfItems. |
|
1717 |
||
| 9985 | 1718 |
editMenu := self class editMenu decodeAsLiteralArray. |
1719 |
moreMenuItem := editMenu menuItemLabeled: 'More'. |
|
1720 |
moreMenuItem submenu: moreMenu asMenu. |
|
1721 |
editMenu findGuiResourcesIn: self. |
|
1722 |
^editMenu |
|
1723 |
||
1724 |
"Created: / 25-12-2007 / 10:10:01 / janfrog" |
|
1725 |
"Modified: / 25-12-2007 / 19:50:53 / janfrog" |
|
1726 |
"Modified: / 18-10-2008 / 20:31:16 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
| 10293 | 1727 |
"Modified: / 08-07-2011 / 13:35:31 / cg" |
| 10780 | 1728 |
"Modified: / 07-10-2011 / 17:58:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 1729 |
! |
1730 |
||
| 10262 | 1731 |
implementorsMenu |
1732 |
||
1733 |
| selectorAndSelectedText selector selectedText implementors | |
|
1734 |
||
1735 |
selectedText := textView selectionAsString. |
|
1736 |
selectedText size > 0 ifTrue:[ |
|
| 11359 | 1737 |
"/ self windowGroup withWaitCursorDo:[ |
| 10262 | 1738 |
selectorAndSelectedText := self extractSelectorAndSelectedTextFrom: selectedText. |
1739 |
selector := selectorAndSelectedText first. |
|
1740 |
selectedText := selectorAndSelectedText second. |
|
1741 |
||
1742 |
(selector notNil and:[selector = selectedText]) ifTrue:[ |
|
1743 |
implementors := (SystemBrowser |
|
| 11359 | 1744 |
findImplementorsOf:selectedText "Any: (Array with:selectedText)" |
1745 |
in:(Smalltalk allClasses) |
|
1746 |
ignoreCase:false) |
|
1747 |
||
1748 |
] ifFalse:[ |
|
| 10262 | 1749 |
implementors := (SystemBrowser |
| 11359 | 1750 |
findImplementorsOfAny:(Array with:selectedText with: selector) |
1751 |
in:(Smalltalk allClasses) |
|
1752 |
ignoreCase:false) |
|
1753 |
]. |
|
1754 |
"/ ] |
|
| 10262 | 1755 |
] ifFalse:[ |
1756 |
implementors := #(). |
|
1757 |
]. |
|
1758 |
||
1759 |
^self implementorsMenu: implementors selector: (selector ? selectedText) |
|
1760 |
||
1761 |
"Modified: / 19-10-2008 / 08:16:50 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1762 |
"Created: / 30-06-2011 / 19:28:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11359 | 1763 |
"Modified: / 05-03-2012 / 09:02:43 / cg" |
| 10262 | 1764 |
! |
1765 |
||
| 13813 | 1766 |
implementorsMenu: implementors selector: selector |
| 9985 | 1767 |
| menu| |
1768 |
||
1769 |
menu := Menu new. |
|
| 10465 | 1770 |
implementors isEmptyOrNil ifTrue:[ |
| 13942 | 1771 |
menu addItem:(MenuItem label:'No implementors found') disable |
| 9985 | 1772 |
] ifFalse:[ |
| 13942 | 1773 |
menu addItem:(MenuItem |
1774 |
label:(selector storeString , (' (all implementors) ') asText allItalic)
|
|
1775 |
itemValue:[ |
|
1776 |
self browseMethods:implementors |
|
1777 |
label:'Implementors of ' , selector storeString |
|
1778 |
]). |
|
1779 |
||
1780 |
menu addSeparator. |
|
1781 |
(implementors asOrderedCollection sort:[:a :b | a mclass name < b mclass name]) |
|
1782 |
"implementors" do:[:mth | |
|
1783 |
menu |
|
1784 |
addItem:(MenuItem label:(selector storeString |
|
1785 |
, (' in ' , mth containingClass nameInBrowser asText allBold))
|
|
1786 |
itemValue:[ self browseMethod:mth label: 'Implementor of ' , selector storeString ]) |
|
1787 |
] |
|
| 9985 | 1788 |
]. |
1789 |
^ menu |
|
1790 |
||
1791 |
"Modified: / 19-10-2008 / 08:16:50 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1792 |
"Created: / 14-02-2010 / 19:39:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 13813 | 1793 |
"Modified: / 07-03-2012 / 12:56:56 / cg" |
1794 |
"Modified: / 14-10-2013 / 10:47:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 9985 | 1795 |
! |
1796 |
||
| 10262 | 1797 |
sendersMenu |
1798 |
||
1799 |
| selectorAndSelectedText selector selectedText senders | |
|
1800 |
||
1801 |
selectedText := textView selectionAsString. |
|
1802 |
selectedText size > 0 ifTrue:[ |
|
| 11359 | 1803 |
"/ self windowGroup withWaitCursorDo:[ |
| 10262 | 1804 |
selectorAndSelectedText := self extractSelectorAndSelectedTextFrom: selectedText. |
1805 |
selector := selectorAndSelectedText first. |
|
1806 |
selectedText := selectorAndSelectedText second. |
|
1807 |
||
1808 |
(selector notNil and:[selector = selectedText]) ifTrue:[ |
|
1809 |
senders := (SystemBrowser |
|
| 11359 | 1810 |
findSendersOf:selectedText "Any:(Array with:selectedText)" |
| 10262 | 1811 |
in:(Smalltalk allClasses) |
1812 |
ignoreCase:false) |
|
1813 |
||
| 11359 | 1814 |
] ifFalse:[ |
| 10262 | 1815 |
senders := (SystemBrowser |
1816 |
findSendersOfAny:(Array with:selectedText with: selector) |
|
1817 |
in:(Smalltalk allClasses) |
|
1818 |
ignoreCase:false) |
|
| 11359 | 1819 |
]. |
1820 |
"/ ] |
|
| 10262 | 1821 |
] ifFalse:[ |
1822 |
senders := #(). |
|
1823 |
]. |
|
1824 |
||
1825 |
^self sendersMenu: senders selector: (selector ? selectedText) |
|
1826 |
||
1827 |
"Modified: / 19-10-2008 / 08:16:50 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1828 |
"Created: / 30-06-2011 / 19:28:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11359 | 1829 |
"Modified: / 05-03-2012 / 09:02:56 / cg" |
| 10262 | 1830 |
! |
1831 |
||
| 13813 | 1832 |
sendersMenu: senders selector: selector |
| 11377 | 1833 |
| menu shownSenderItems numCut sendersSorted| |
| 9985 | 1834 |
|
| 10262 | 1835 |
menu := Menu new. |
| 10465 | 1836 |
senders isEmptyOrNil ifTrue:[ |
| 13942 | 1837 |
menu addItem:(MenuItem label:'No senders found') disable |
| 9985 | 1838 |
] ifFalse:[ |
| 13942 | 1839 |
menu addItem:(MenuItem |
1840 |
label:(selector storeString , (' (all senders)') asText allItalic)
|
|
1841 |
itemValue:[ |
|
1842 |
self browseMethods:senders |
|
1843 |
label:'Senders of ' , selector storeString |
|
1844 |
]). |
|
1845 |
menu addSeparator. |
|
1846 |
sendersSorted := senders asOrderedCollection |
|
1847 |
sort:[:a :b | a whoString < b whoString]. |
|
1848 |
shownSenderItems := (senders size > 20) ifTrue:[sendersSorted copyTo:20] ifFalse:[sendersSorted]. |
|
1849 |
numCut := senders size - 20. |
|
1850 |
shownSenderItems do:[:mth | |
|
1851 |
menu |
|
1852 |
addItem:(MenuItem label:(mth selector storeString |
|
1853 |
, (' in ' , mth containingClass nameInBrowser asText allBold))
|
|
1854 |
itemValue:[ self browseMethod:mth label: 'Sender of ' , selector storeString ]) |
|
1855 |
]. |
|
1856 |
numCut > 0 ifTrue:[ |
|
1857 |
menu addSeparator. |
|
1858 |
menu addItem:(MenuItem label:('... %1 more senders not shown here' bindWith:numCut)) disable
|
|
1859 |
]. |
|
| 9985 | 1860 |
]. |
1861 |
^ menu |
|
1862 |
||
1863 |
"Modified: / 19-10-2008 / 08:17:00 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1864 |
"Created: / 14-02-2010 / 19:40:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10262 | 1865 |
"Modified: / 07-07-2011 / 14:51:54 / jv" |
| 13813 | 1866 |
"Modified: / 07-03-2012 / 12:58:31 / cg" |
1867 |
"Modified: / 14-10-2013 / 10:47:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 9985 | 1868 |
! |
1869 |
||
1870 |
servicesMenu |
|
| 10293 | 1871 |
|menu item anyService| |
1872 |
||
| 9985 | 1873 |
menu := Menu new. |
| 13110 | 1874 |
item := (MenuItem label:(resources string:'Services (experimental)')) enabled:false. |
1875 |
menu addItem:item. |
|
1876 |
menu addSeparator. |
|
| 10293 | 1877 |
|
| 13097 | 1878 |
"/ disabled, because this menu is now on the gutter, |
1879 |
"/ and it makes it hard to show it again, once hidden |
|
1880 |
||
1881 |
"/ item := MenuItem label:(resources string:'Show Gutter'). |
|
1882 |
"/ item indication:(self showGutterChannel). |
|
1883 |
"/ menu addItem:item. |
|
1884 |
"/ menu addSeparator. |
|
| 10293 | 1885 |
|
1886 |
anyService := false. |
|
1887 |
services do:[:service | |
|
1888 |
|item| |
|
1889 |
||
1890 |
item := MenuItem label:(resources string:service label). |
|
1891 |
item indication:((AspectAdaptor forAspect:#enabled) subject:service). |
|
| 13108 | 1892 |
item hideMenuOnActivated:false. |
| 10293 | 1893 |
menu addItem:item. |
1894 |
anyService := true. |
|
1895 |
]. |
|
1896 |
||
1897 |
anyService ifTrue:[ |
|
1898 |
menu addSeparator. |
|
1899 |
]. |
|
1900 |
||
1901 |
item := MenuItem label:(resources string:'Debug'). |
|
| 13108 | 1902 |
item submenuChannel:[ self debugMenu ]. |
| 10293 | 1903 |
menu addItem:item. |
1904 |
||
1905 |
^ menu |
|
| 9985 | 1906 |
|
1907 |
"Created: / 07-03-2010 / 14:03:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10767 | 1908 |
"Modified: / 06-10-2011 / 14:14:30 / cg" |
| 9985 | 1909 |
! ! |
1910 |
||
1911 |
!CodeView2 methodsFor:'private'! |
|
1912 |
||
1913 |
codeCompletion |
|
| 14110 | 1914 |
"/ I found this code 3 times (CodeView2, NewSystemBrowser and DebugView) - smell? |
1915 |
"/ (can we move that to a utility - probably DoWhatIMeanSupport) |
|
1916 |
||
1917 |
|cls language| |
|
| 9985 | 1918 |
|
1919 |
cls := self classHolder value. |
|
| 14110 | 1920 |
cls notNil ifTrue:[ |
1921 |
language := cls programmingLanguage |
|
| 9985 | 1922 |
]. |
1923 |
UserInformation handle:[:ex | |
|
1924 |
self showInfo:(ex messageText). |
|
1925 |
ex proceed. |
|
1926 |
] do:[ |
|
1927 |
self withWaitCursorDo:[ |
|
| 14110 | 1928 |
DoWhatIMeanSupport codeCompletionForLanguage:language class:cls context:nil codeView:self. |
| 9985 | 1929 |
] |
1930 |
]. |
|
1931 |
^ self. |
|
1932 |
||
1933 |
"Modified: / 04-07-2006 / 18:48:26 / fm" |
|
1934 |
"Modified: / 20-11-2006 / 12:30:59 / cg" |
|
|
13559
5215c061491c
Pass programming language when asking DWIM to complete code
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13517
diff
changeset
|
1935 |
"Modified: / 18-09-2013 / 14:18:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 1936 |
! |
1937 |
||
1938 |
reallyModified |
|
1939 |
"check for modified code by comparing the source against |
|
| 14439 | 1940 |
the codeView's contents. |
| 14503 | 1941 |
That's the true modified value |
1942 |
(in case user undid his changes, and the displayed text is actually original)" |
|
1943 |
||
1944 |
|modified| |
|
1945 |
||
1946 |
"/ cg: why this? It does not make sense to me. |
|
1947 |
"/ either we can depend on what the textView tells me here |
|
1948 |
"/ in which case we don't need the code below, |
|
1949 |
"/ or we cannot, in which the textView modified query should be removed. |
|
1950 |
"/ from tracing, it looks as if the textView modified query is correct all the time. |
|
1951 |
"/ Can someone validate/verify this, please? |
|
1952 |
textView modified ifTrue:[^true]. |
|
1953 |
||
1954 |
"/ higher prio to prevent it from being changed while we convert it (by editing) |
|
| 9985 | 1955 |
Processor activeProcess |
1956 |
withHigherPriorityDo:[ |
|
| 14503 | 1957 |
modified := textView isTextDifferentFromOriginalSource. |
| 9985 | 1958 |
]. |
1959 |
||
1960 |
^ modified |
|
1961 |
||
1962 |
"Created: / 06-02-2010 / 19:59:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11559 | 1963 |
"Modified (format): / 05-06-2012 / 23:55:02 / cg" |
| 9985 | 1964 |
! |
1965 |
||
1966 |
showInfo: message |
|
1967 |
||
1968 |
| app | |
|
1969 |
(app := self topView application) ifNotNil: |
|
1970 |
[(app respondsTo: #showInfo:) ifTrue: |
|
1971 |
[app showInfo: message]]. |
|
1972 |
||
1973 |
"Modified: / 13-02-2010 / 23:25:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1974 |
! ! |
|
1975 |
||
1976 |
!CodeView2 methodsFor:'private-accessing'! |
|
1977 |
||
1978 |
gutterView |
|
1979 |
||
1980 |
^gutterView |
|
1981 |
||
1982 |
"Created: / 14-02-2010 / 15:21:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1983 |
! |
|
1984 |
||
1985 |
syntaxElementSelection |
|
1986 |
^ syntaxElementSelection |
|
1987 |
! |
|
1988 |
||
| 13813 | 1989 |
syntaxElementSelection:anElement |
1990 |
syntaxElementSelection := anElement. |
|
1991 |
"/ anElement isNil ifTrue:[ |
|
1992 |
"/ currentParseNodeHolder value: nil. |
|
1993 |
"/"/ currentBlockNodeHolder value: nil. |
|
1994 |
"/ ] ifFalse:[ |
|
1995 |
"/ currentParseNodeHolder value: anElement node. |
|
1996 |
"/"/ currentBlockNodeHolder value: anElement node enclosingBlock. |
|
1997 |
"/ ] |
|
1998 |
||
1999 |
"Modified: / 24-09-2013 / 00:14:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 9985 | 2000 |
! |
2001 |
||
2002 |
syntaxElements |
|
2003 |
^ syntaxElements |
|
2004 |
! |
|
2005 |
||
2006 |
syntaxElements:something |
|
2007 |
syntaxElements := something. |
|
2008 |
! |
|
2009 |
||
2010 |
textView |
|
2011 |
||
2012 |
^textView |
|
2013 |
||
2014 |
"Created: / 14-02-2010 / 15:21:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2015 |
! |
|
2016 |
||
2017 |
textViewScroller |
|
2018 |
||
2019 |
^textViewScroller |
|
2020 |
||
2021 |
"Created: / 14-02-2010 / 15:21:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2022 |
! ! |
|
2023 |
||
| 11179 | 2024 |
!CodeView2 methodsFor:'realization'! |
2025 |
||
| 13062 | 2026 |
disableAllServices |
2027 |
||
2028 |
services do:[:service| |
|
2029 |
service enabled:false. |
|
2030 |
] |
|
2031 |
! |
|
2032 |
||
2033 |
enableAllServices |
|
2034 |
||
2035 |
services do:[:service| |
|
2036 |
service enabled:true. |
|
2037 |
] |
|
2038 |
! |
|
2039 |
||
| 11179 | 2040 |
postRealize |
2041 |
||
2042 |
services do:[:service| |
|
2043 |
service viewRealized. |
|
2044 |
] |
|
2045 |
||
2046 |
"Created: / 23-01-2012 / 10:35:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2047 |
! ! |
|
2048 |
||
|
13975
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
2049 |
!CodeView2 methodsFor:'redrawing'! |
|
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
2050 |
|
|
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
2051 |
flash |
|
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
2052 |
textView flash. |
|
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
2053 |
|
|
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
2054 |
"Created: / 21-02-2014 / 16:57:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
2055 |
! ! |
|
21b5fc56a638
Added Tools::CodeView2>>#flash
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13962
diff
changeset
|
2056 |
|
| 9985 | 2057 |
!CodeView2 methodsFor:'services'! |
2058 |
||
| 13108 | 2059 |
breakpointService |
2060 |
"that one or nil" |
|
2061 |
||
2062 |
^ services detect:[:any| (any isKindOf: BreakpointService)] ifNone:nil |
|
2063 |
! |
|
2064 |
||
| 9985 | 2065 |
registerService: aCodeViewService |
2066 |
||
2067 |
services add: aCodeViewService. |
|
2068 |
aCodeViewService registerIn: self |
|
2069 |
||
2070 |
"Created: / 06-03-2010 / 19:19:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2071 |
! |
|
2072 |
||
| 13108 | 2073 |
syntaxHighlightingService |
2074 |
"that one or nil" |
|
2075 |
||
2076 |
^ services detect:[:any| (any isKindOf: CodeHighlightingService)] ifNone:nil |
|
2077 |
! |
|
2078 |
||
| 13125 | 2079 |
unregisterAllServices |
2080 |
||
2081 |
services copy do:[:eachService | self unregisterService:eachService ]. |
|
2082 |
! |
|
2083 |
||
| 11616 | 2084 |
unregisterService: aCodeViewService |
| 9985 | 2085 |
|
2086 |
services remove: aCodeViewService ifAbsent:[^self]. |
|
2087 |
aCodeViewService unregister. |
|
2088 |
||
2089 |
"Created: / 06-03-2010 / 19:21:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11616 | 2090 |
"Created: / 19-07-2012 / 16:34:18 / cg" |
| 9985 | 2091 |
! ! |
2092 |
||
2093 |
!CodeView2 methodsFor:'testing'! |
|
2094 |
||
| 10722 | 2095 |
isCodeView2 |
2096 |
||
2097 |
^true |
|
2098 |
||
2099 |
"Created: / 20-07-2010 / 15:43:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2100 |
! |
|
2101 |
||
| 9985 | 2102 |
isTextView |
2103 |
||
2104 |
^true |
|
2105 |
||
2106 |
"Created: / 14-02-2010 / 22:13:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2107 |
! ! |
|
2108 |
||
2109 |
!CodeView2::GutterView methodsFor:'accessing'! |
|
2110 |
||
| 13098 | 2111 |
menuHolder:aValueThing |
2112 |
menuHolder := aValueThing |
|
2113 |
! |
|
2114 |
||
| 9985 | 2115 |
setTextView: aTextView |
2116 |
||
2117 |
self assert: textView isNil message:'Attempting to set textView twice'. |
|
2118 |
textView := aTextView. |
|
2119 |
||
| 13057 | 2120 |
textView addDependent:self. |
2121 |
||
| 10577 | 2122 |
"/ self backgroundPaint: textView backgroundPaint darkened lighter. |
2123 |
self viewBackground: (View defaultBackgroundColor). "/ textView backgroundPaint darkened lighter. |
|
| 9985 | 2124 |
self paint: textView paint. |
2125 |
self font: textView font. |
|
2126 |
||
2127 |
"Created: / 02-09-2009 / 21:55:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2128 |
"Modified: / 14-12-2009 / 15:09:29 / Jindra <a>" |
|
2129 |
"Modified: / 09-02-2010 / 20:03:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10577 | 2130 |
"Modified: / 17-08-2011 / 15:15:09 / cg" |
| 9985 | 2131 |
! |
2132 |
||
2133 |
setTextViewScroller:aScr |
|
2134 |
textViewScroller := aScr. |
|
2135 |
||
2136 |
"Created: / 07-12-2009 / 22:36:31 / Jindra <a>" |
|
| 13567 | 2137 |
! |
2138 |
||
2139 |
showLineNumbers:aBoolean |
|
2140 |
"can be used to turn off linenumber drawing, |
|
2141 |
in case the gutter is used with another view anf only the other features (breakpoints) are needed" |
|
2142 |
||
2143 |
showLineNumbers := aBoolean. |
|
| 9985 | 2144 |
! ! |
2145 |
||
2146 |
!CodeView2::GutterView methodsFor:'accessing-dimensions'! |
|
2147 |
||
| 10781 | 2148 |
acceptButtonBottom |
2149 |
||
| 10791 | 2150 |
^(self height * 0.6) ceiling. |
| 10781 | 2151 |
|
2152 |
"Created: / 07-10-2011 / 19:53:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2153 |
! |
|
2154 |
||
| 13813 | 2155 |
acceptCancelRight |
| 13942 | 2156 |
^((self paddingLeft) + self usedWidthForAcceptCancel) |
| 13813 | 2157 |
|
2158 |
"Created: / 10-09-2013 / 03:00:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 13942 | 2159 |
"Modified: / 14-02-2014 / 12:06:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 13813 | 2160 |
! |
2161 |
||
| 10781 | 2162 |
cancelButtonBottom |
2163 |
||
| 10791 | 2164 |
^(self height * 0.8) ceiling. |
| 10781 | 2165 |
|
2166 |
"Created: / 07-10-2011 / 19:54:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2167 |
! |
|
2168 |
||
| 9985 | 2169 |
padding |
2170 |
||
2171 |
^self paddingLeft + self paddingRight |
|
|
11988
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
2172 |
+ self usedWidthForAcceptCancel |
| 9985 | 2173 |
+ (widthAnnotations ? 0) |
2174 |
+ (widthDiffInfo ? 0) |
|
2175 |
||
2176 |
"Created: / 14-02-2010 / 22:28:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10781 | 2177 |
"Modified: / 07-10-2011 / 19:01:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2178 |
"Modified (format): / 07-10-2011 / 20:45:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 9985 | 2179 |
! |
2180 |
||
2181 |
paddingLeft |
|
2182 |
||
2183 |
^0"px" |
|
2184 |
||
2185 |
"Created: / 14-02-2010 / 22:27:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2186 |
"Modified: / 16-06-2011 / 13:47:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2187 |
! |
|
2188 |
||
2189 |
paddingRight |
|
2190 |
||
| 13813 | 2191 |
^3"px" |
| 9985 | 2192 |
|
2193 |
"Created: / 14-02-2010 / 22:27:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 13813 | 2194 |
"Modified: / 16-02-2012 / 22:40:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 2195 |
! |
2196 |
||
2197 |
preferredExtent |
|
| 11467 | 2198 |
| font w h | |
| 9985 | 2199 |
|
2200 |
explicitExtent ifNotNil:[^explicitExtent]. |
|
2201 |
preferredExtent ifNotNil:[^preferredExtent]. |
|
2202 |
||
| 11467 | 2203 |
font := self font. |
2204 |
w := (font widthOf:'00') + self padding. |
|
2205 |
h := textView notNil |
|
2206 |
ifTrue:[textView height] |
|
2207 |
ifFalse:[font height * 12]. |
|
| 9985 | 2208 |
|
2209 |
^preferredExtent := w @ h |
|
2210 |
||
2211 |
"Modified: / 16-06-2011 / 14:03:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11467 | 2212 |
"Modified (format): / 26-03-2012 / 11:19:54 / cg" |
|
11988
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
2213 |
! |
|
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
2214 |
|
|
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
2215 |
usedWidthForAcceptCancel |
| 13567 | 2216 |
^ (codeView notNil and:[codeView showAcceptCancelBar]) ifTrue:[widthAcceptCancel ? 0] ifFalse:[0] |
| 9985 | 2217 |
! ! |
2218 |
||
| 10781 | 2219 |
!CodeView2::GutterView methodsFor:'actions'! |
2220 |
||
2221 |
accept |
|
2222 |
||
2223 |
textView accept |
|
2224 |
||
2225 |
"Created: / 07-10-2011 / 20:23:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2226 |
! |
|
2227 |
||
2228 |
cancel |
|
2229 |
||
2230 |
textView cancel |
|
2231 |
||
2232 |
"Created: / 07-10-2011 / 20:23:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2233 |
! |
|
2234 |
||
2235 |
diff |
|
2236 |
||
2237 |
"Created: / 07-10-2011 / 20:23:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 13097 | 2238 |
! |
2239 |
||
| 13108 | 2240 |
inspectView |
2241 |
self halt. |
|
2242 |
! |
|
2243 |
||
| 13098 | 2244 |
middleButtonMenu |
2245 |
menuHolder notNil ifTrue:[^ menuHolder value]. |
|
| 13567 | 2246 |
codeView isNil ifTrue:[^ nil]. |
| 13097 | 2247 |
^ codeView servicesMenu |
| 10781 | 2248 |
! ! |
2249 |
||
| 13813 | 2250 |
!CodeView2::GutterView methodsFor:'aspects'! |
2251 |
||
2252 |
currentBlockNodeHolder |
|
2253 |
"return/create the 'currentBlockNodeHolder' value holder (automatically generated)" |
|
2254 |
||
2255 |
currentBlockNodeHolder isNil ifTrue:[ |
|
| 13942 | 2256 |
currentBlockNodeHolder := ValueHolder new. |
2257 |
currentBlockNodeHolder addDependent:self. |
|
| 13813 | 2258 |
]. |
2259 |
^ currentBlockNodeHolder |
|
2260 |
! |
|
2261 |
||
2262 |
currentBlockNodeHolder:something |
|
2263 |
"set the 'currentBlockNodeHolder' value holder (automatically generated)" |
|
2264 |
||
2265 |
|oldValue newValue| |
|
2266 |
||
2267 |
currentBlockNodeHolder notNil ifTrue:[ |
|
| 13942 | 2268 |
oldValue := currentBlockNodeHolder value. |
2269 |
currentBlockNodeHolder removeDependent:self. |
|
| 13813 | 2270 |
]. |
2271 |
currentBlockNodeHolder := something. |
|
2272 |
currentBlockNodeHolder notNil ifTrue:[ |
|
| 13942 | 2273 |
currentBlockNodeHolder addDependent:self. |
| 13813 | 2274 |
]. |
2275 |
newValue := currentBlockNodeHolder value. |
|
2276 |
oldValue ~~ newValue ifTrue:[ |
|
| 13942 | 2277 |
self update:#value with:newValue from:currentBlockNodeHolder. |
| 13813 | 2278 |
]. |
2279 |
! ! |
|
2280 |
||
| 9985 | 2281 |
!CodeView2::GutterView methodsFor:'change & update'! |
2282 |
||
| 13057 | 2283 |
adjustSizeForLongestLine |
| 13098 | 2284 |
"recompute the required width (longest linenumber present, not shown)" |
2285 |
||
2286 |
|newNumberOfLines longestLineString textW requiredW newWidth| |
|
2287 |
||
| 13568 | 2288 |
showLineNumbers ifFalse:[^ self]. |
2289 |
||
| 13105 | 2290 |
newNumberOfLines := (textView list size max:textView cursorLine). |
| 13098 | 2291 |
|
2292 |
longestLineString := self displayedString:(newNumberOfLines max:99). |
|
| 13057 | 2293 |
textW := (longestLineString widthOn:self). |
2294 |
requiredW := textW + self padding. |
|
2295 |
||
2296 |
((requiredW > width) or:[requiredW < (width * 3 // 4)]) ifTrue:[ |
|
2297 |
"/ some hysteresis to avoid quick readjust again |
|
| 13316 | 2298 |
newWidth := (requiredW "* 1.1") rounded. |
| 13057 | 2299 |
self corner:(newWidth+1 @ 1.0). |
| 13316 | 2300 |
|
| 13085 | 2301 |
[ |
2302 |
textView removeDependent:self. |
|
| 13568 | 2303 |
textViewScroller notNil ifTrue:[ textViewScroller origin:(newWidth+1 @ 0.0) corner:(1.0 @ 1.0) ]. |
| 13085 | 2304 |
] ensure:[ |
2305 |
textView addDependent:self. |
|
2306 |
]. |
|
| 13057 | 2307 |
self invalidate. |
| 13098 | 2308 |
] ifFalse:[ |
2309 |
numberOfLines ~= newNumberOfLines ifTrue:[ |
|
2310 |
self invalidate |
|
2311 |
] |
|
| 13057 | 2312 |
]. |
2313 |
! |
|
2314 |
||
| 9985 | 2315 |
update:something with:aParameter from:changedObject |
| 14127 | 2316 |
|deltaY numPixels hScrollerHeight| |
| 9985 | 2317 |
|
| 10326 | 2318 |
(changedObject == textView) ifTrue:[ |
| 13942 | 2319 |
((something == #sizeOfContents) |
2320 |
or:[ "false "(something == #visibility)"" ]) ifTrue:[ |
|
2321 |
self adjustSizeForLongestLine. |
|
| 13057 | 2322 |
|
| 14127 | 2323 |
"/ (numberOfLines ~= (textView list size max:textView cursorLine)) ifTrue:[ |
2324 |
"/ self invalidate. |
|
2325 |
"/ ]. |
|
| 13942 | 2326 |
^ self. |
2327 |
]. |
|
2328 |
something == #originOfContents ifTrue:[ |
|
| 14127 | 2329 |
aParameter notNil ifTrue:[ |
2330 |
deltaY := aParameter y. |
|
2331 |
deltaY = 0 ifTrue:[^ self]. |
|
2332 |
||
2333 |
numPixels := deltaY abs. |
|
2334 |
numPixels < (height // 5) ifTrue:[ |
|
2335 |
deltaY < 0 ifTrue:[ |
|
2336 |
self invalidateX:0 y:0 width:width height:numPixels. |
|
2337 |
] ifFalse:[ |
|
2338 |
hScrollerHeight := 0. |
|
2339 |
(textViewScroller notNil |
|
2340 |
and:[textViewScroller horizontalScrollBar notNil]) ifTrue:[ |
|
2341 |
hScrollerHeight := textViewScroller horizontalScrollBar height. |
|
2342 |
]. |
|
2343 |
numPixels := numPixels + 4. |
|
2344 |
self invalidateX:0 y:height-numPixels-hScrollerHeight width:width height:numPixels+hScrollerHeight. |
|
2345 |
]. |
|
2346 |
self repairDamage. |
|
2347 |
^ self. |
|
2348 |
]. |
|
2349 |
]. |
|
| 13942 | 2350 |
self invalidateLines. |
2351 |
^ self. |
|
2352 |
]. |
|
2353 |
"/ something printCR. |
|
| 10312 | 2354 |
]. |
| 13057 | 2355 |
|
| 10781 | 2356 |
(changedObject == textView reallyModifiedChannel) ifTrue:[ |
| 13942 | 2357 |
self invalidateAcceptCancelBar. |
2358 |
^self. |
|
| 10781 | 2359 |
]. |
| 9985 | 2360 |
|
2361 |
super update:something with:aParameter from:changedObject |
|
2362 |
||
| 10326 | 2363 |
"Modified (format): / 15-07-2011 / 20:14:04 / cg" |
| 13942 | 2364 |
"Modified: / 14-02-2014 / 12:08:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 2365 |
! ! |
2366 |
||
2367 |
!CodeView2::GutterView methodsFor:'event handling'! |
|
2368 |
||
2369 |
buttonPress: btn x: x y: y |
|
|
11520
091c7e0e435a
added a save-area (line-number) into which a click does not toggle
Claus Gittinger <cg@exept.de>
parents:
11467
diff
changeset
|
2370 |
|extraSafeArea| |
|
091c7e0e435a
added a save-area (line-number) into which a click does not toggle
Claus Gittinger <cg@exept.de>
parents:
11467
diff
changeset
|
2371 |
|
|
11988
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
2372 |
(x <= (self paddingLeft + self usedWidthForAcceptCancel)) ifTrue:[ |
|
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
2373 |
textView reallyModified ifTrue:[ |
|
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
2374 |
(y < self acceptButtonBottom) ifTrue:[ |
|
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
2375 |
self accept. |
|
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
2376 |
^self. |
|
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
2377 |
]. |
|
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
2378 |
(y < self cancelButtonBottom) ifTrue:[ |
|
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
2379 |
self cancel. |
|
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
2380 |
^self. |
|
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
2381 |
]. |
|
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
2382 |
self diff. |
| 10781 | 2383 |
]. |
2384 |
^self. |
|
2385 |
]. |
|
2386 |
||
| 13567 | 2387 |
false ifTrue:[ |
2388 |
"Do not allow clicking on line numbers..." |
|
2389 |
extraSafeArea := "('999' widthOn:self)" 5.
|
|
2390 |
x < (self width - self paddingRight - widthDiffInfo - extraSafeArea) ifFalse:[^ self]. |
|
2391 |
]. |
|
2392 |
||
2393 |
codeView notNil ifTrue:[ |
|
2394 |
((x > (self paddingLeft + self usedWidthForAcceptCancel)) or: |
|
2395 |
[x < (self width - self paddingRight - widthDiffInfo)] |
|
2396 |
) ifTrue:[ |
|
2397 |
(codeView buttonPress: btn x:x y:y in: self) ifTrue:[^ self]. "/ event eaten |
|
2398 |
]. |
|
2399 |
]. |
|
2400 |
super buttonPress: btn x: x y: y |
|
| 9985 | 2401 |
|
2402 |
"Created: / 17-06-2011 / 13:02:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
|
11520
091c7e0e435a
added a save-area (line-number) into which a click does not toggle
Claus Gittinger <cg@exept.de>
parents:
11467
diff
changeset
|
2403 |
"Modified (comment): / 18-05-2012 / 10:56:54 / cg" |
| 13813 | 2404 |
! |
2405 |
||
2406 |
sizeChanged:how |
|
2407 |
super sizeChanged:how. |
|
2408 |
self invalidateAcceptCancelBar. |
|
2409 |
||
2410 |
"Created: / 10-09-2013 / 03:19:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 9985 | 2411 |
! ! |
2412 |
||
| 11220 | 2413 |
!CodeView2::GutterView methodsFor:'help'! |
2414 |
||
2415 |
flyByHelpText |
|
| 13127 | 2416 |
|bpntService| |
| 12903 | 2417 |
|
| 13568 | 2418 |
(codeView notNil |
2419 |
and:[ (bpntService := codeView breakpointService) notNil |
|
2420 |
and:[ bpntService isEnabled ]]) ifTrue:[ |
|
2421 |
^ bpntService flyByHelpText |
|
| 12903 | 2422 |
]. |
| 13568 | 2423 |
^ nil |
| 11220 | 2424 |
! ! |
2425 |
||
| 9985 | 2426 |
!CodeView2::GutterView methodsFor:'initialization'! |
2427 |
||
2428 |
initialize |
|
2429 |
||
2430 |
super initialize. |
|
|
11988
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
2431 |
|
| 13567 | 2432 |
showLineNumbers := true. |
2433 |
||
| 10781 | 2434 |
widthAcceptCancel := 16. |
| 13813 | 2435 |
widthAnnotations := "16"8. |
| 9985 | 2436 |
widthDiffInfo := 5. |
2437 |
||
| 13962 | 2438 |
acceptColor := Color green lighter onDevice:self graphicsDevice. |
2439 |
cancelColor := Color red lighter lighter onDevice:self graphicsDevice. |
|
2440 |
diffColor := Color yellow lighter lighter onDevice:self graphicsDevice. |
|
| 10781 | 2441 |
|
| 9985 | 2442 |
"Created: / 16-06-2011 / 13:47:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2443 |
! |
|
2444 |
||
2445 |
setCodeView: aCodeView2 |
|
2446 |
||
2447 |
codeView := aCodeView2. |
|
|
11988
b482d2c77040
changed to not take up screen space for the accept/cancel gutter,
Claus Gittinger <cg@exept.de>
parents:
11903
diff
changeset
|
2448 |
|
| 9985 | 2449 |
codeView addDependent: self. |
| 10784 | 2450 |
codeView reallyModifiedChannel addDependent: self. |
| 13993 | 2451 |
"/ codeView currentBlockNodeHolder addDependent: self. - not needed; currentBlockNodeHolder: does it |
| 13813 | 2452 |
|
2453 |
textView := aCodeView2 textView. |
|
| 9985 | 2454 |
textView addDependent: self. |
| 13993 | 2455 |
"/ do not fetch stuff from others - let others give me things (caller change to send currentBlockNodeHolder: explicitly) |
2456 |
"/ self currentBlockNodeHolder: codeView currentBlockNodeHolder. |
|
| 9985 | 2457 |
textViewScroller := aCodeView2 textViewScroller. |
| 10577 | 2458 |
"/ self backgroundPaint: (textView viewBackground "backgroundPaint" blendWith: (Color gray:80)). |
2459 |
self viewBackground: (View defaultBackgroundColor). |
|
| 9985 | 2460 |
|
2461 |
"Created: / 14-02-2010 / 15:19:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10577 | 2462 |
"Modified: / 17-08-2011 / 15:15:55 / cg" |
| 13813 | 2463 |
"Modified: / 05-04-2012 / 17:46:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 2464 |
! ! |
2465 |
||
2466 |
!CodeView2::GutterView methodsFor:'queries'! |
|
2467 |
||
2468 |
displayedString: line |
|
2469 |
"get text to display in gutter for specified list line number" |
|
2470 |
||
2471 |
^(line asString). |
|
2472 |
||
2473 |
"Created: / 14-12-2009 / 13:37:47 / Jindra <a>" |
|
2474 |
! |
|
2475 |
||
| 13105 | 2476 |
lineColorForLine:line |
| 9985 | 2477 |
"return special color for given line if required, nil otherwise" |
| 13105 | 2478 |
"used only if lineFont returns nil" |
| 9985 | 2479 |
|
2480 |
^nil |
|
2481 |
||
2482 |
"Created: / 14-12-2009 / 15:01:31 / Jindra <a>" |
|
2483 |
! |
|
2484 |
||
2485 |
lineDisplayable:line |
|
2486 |
"true if this list line can be displayed" |
|
2487 |
^(textView listLineIsVisible:line) |
|
2488 |
||
2489 |
"Created: / 14-12-2009 / 13:38:23 / Jindra <a>" |
|
2490 |
! |
|
2491 |
||
| 13105 | 2492 |
lineFontForLine:line |
| 9985 | 2493 |
"return special font for given line if required, nil otherwise" |
2494 |
||
2495 |
^nil |
|
2496 |
||
2497 |
"Created: / 14-12-2009 / 14:40:17 / Jindra <a>" |
|
2498 |
! |
|
2499 |
||
| 13566 | 2500 |
wantsFocusWithButtonPress |
2501 |
^ false. |
|
2502 |
! |
|
2503 |
||
| 13213 | 2504 |
yOfTextViewLine:lineNr |
2505 |
"defined to allow computation of a line below what is visible in |
|
2506 |
the textView (because gutter may become higher than textView, iff |
|
2507 |
the textView has a horizontal scrollbar" |
|
2508 |
||
2509 |
|visibleLineNr "{ Class: SmallInteger }"|
|
|
2510 |
||
| 13813 | 2511 |
"/JV: BAD, BAD BAD - check senders, they are not prepared |
2512 |
"/ to get nil!! |
|
| 13213 | 2513 |
shown ifFalse:[^ nil]. |
2514 |
lineNr isNil ifTrue:[^ nil]. |
|
2515 |
visibleLineNr := lineNr - textView firstLineShown + 1. |
|
2516 |
^ textView yOfVisibleLine:visibleLineNr |
|
| 13813 | 2517 |
|
2518 |
"Modified (format): / 28-08-2013 / 12:49:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 9985 | 2519 |
! ! |
2520 |
||
2521 |
!CodeView2::GutterView methodsFor:'redrawing'! |
|
2522 |
||
| 13813 | 2523 |
invalidateAcceptCancelBar |
2524 |
| w | |
|
2525 |
||
|
13978
f4adc42d7354
Fixed some redraw problems when internal accept-cancel is disabled.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13975
diff
changeset
|
2526 |
w := self acceptCancelRight. |
|
f4adc42d7354
Fixed some redraw problems when internal accept-cancel is disabled.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13975
diff
changeset
|
2527 |
w == 0 ifTrue:[ ^ self ]. |
| 13813 | 2528 |
self |
| 13942 | 2529 |
invalidateX: 0 |
2530 |
y: 0 |
|
2531 |
width: w |
|
2532 |
height: self height. |
|
| 13813 | 2533 |
|
2534 |
"Created: / 10-09-2013 / 03:07:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
|
13978
f4adc42d7354
Fixed some redraw problems when internal accept-cancel is disabled.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13975
diff
changeset
|
2535 |
"Modified: / 21-02-2014 / 21:50:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 13813 | 2536 |
! |
2537 |
||
| 13097 | 2538 |
invalidateDeviceRectangle:aRectangle repairNow:doRepairNow |
2539 |
^ super invalidateDeviceRectangle:aRectangle repairNow:doRepairNow |
|
2540 |
! |
|
2541 |
||
| 13813 | 2542 |
invalidateLines |
2543 |
||
2544 |
| x0 | |
|
| 13942 | 2545 |
x0 := self acceptCancelRight + 1. |
| 13813 | 2546 |
self |
| 13942 | 2547 |
invalidateX: x0 |
2548 |
y: 0 |
|
2549 |
width: self width - x0 |
|
2550 |
height: self height. |
|
| 13813 | 2551 |
|
2552 |
"Created: / 10-09-2013 / 03:08:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 13942 | 2553 |
"Modified: / 14-02-2014 / 12:19:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 13813 | 2554 |
! |
2555 |
||
| 10781 | 2556 |
redrawAcceptCancelBarX: x y: y width:w height:h |
2557 |
||
|
13978
f4adc42d7354
Fixed some redraw problems when internal accept-cancel is disabled.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13975
diff
changeset
|
2558 |
| rw acceptRight acceptBottom cancelBottom | |
|
f4adc42d7354
Fixed some redraw problems when internal accept-cancel is disabled.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13975
diff
changeset
|
2559 |
|
|
f4adc42d7354
Fixed some redraw problems when internal accept-cancel is disabled.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13975
diff
changeset
|
2560 |
acceptRight := self acceptCancelRight. |
|
f4adc42d7354
Fixed some redraw problems when internal accept-cancel is disabled.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13975
diff
changeset
|
2561 |
x >= acceptRight ifTrue:[ |
| 13942 | 2562 |
^self. |
| 10781 | 2563 |
]. |
|
13978
f4adc42d7354
Fixed some redraw problems when internal accept-cancel is disabled.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13975
diff
changeset
|
2564 |
rw := ((x + w) min: acceptRight) - x. |
| 13813 | 2565 |
|
| 10781 | 2566 |
|
2567 |
textView reallyModified ifFalse:[ |
|
| 13942 | 2568 |
self fillRectangleX:x y:y width:rw height:h color: self viewBackground |
| 10781 | 2569 |
] ifTrue:[ |
| 13942 | 2570 |
acceptBottom := self acceptButtonBottom. |
2571 |
cancelBottom := self cancelButtonBottom. |
|
2572 |
y < acceptBottom ifTrue:[ |
|
2573 |
self fillRectangleX:x y:y width:rw height: ((y + h) min: acceptBottom) color: acceptColor. |
|
2574 |
]. |
|
2575 |
(y < cancelBottom) ifTrue:[ |
|
2576 |
self fillRectangleX:x y: acceptBottom + 1width:rw height: ((y + h) min: cancelBottom) - acceptBottom - 1color: cancelColor. |
|
2577 |
]. |
|
2578 |
(y + h >= cancelBottom) ifTrue:[ |
|
2579 |
self fillRectangleX:x y: cancelBottom + 1 width:rw height: (y + h) - cancelBottom - 1 color: diffColor. |
|
2580 |
] |
|
| 13813 | 2581 |
|
| 10781 | 2582 |
] |
2583 |
||
2584 |
"Created: / 07-10-2011 / 19:44:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
|
13978
f4adc42d7354
Fixed some redraw problems when internal accept-cancel is disabled.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13975
diff
changeset
|
2585 |
"Modified: / 21-02-2014 / 21:49:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10781 | 2586 |
! |
2587 |
||
| 9985 | 2588 |
redrawBackgroundX:x y:y width:w height:h |
2589 |
"redraws gutter background" |
|
2590 |
||
| 13091 | 2591 |
|savPaint| |
2592 |
||
| 9985 | 2593 |
"background is filled with background color" |
2594 |
self |
|
| 13057 | 2595 |
clearRectangleX:x |
| 9985 | 2596 |
y:y |
2597 |
width:w |
|
| 13057 | 2598 |
height:h. |
| 9985 | 2599 |
|
| 13091 | 2600 |
"separator line is drawn in grey" |
2601 |
savPaint := self paint. |
|
2602 |
self paint:Color grey. |
|
2603 |
||
| 9985 | 2604 |
self |
| 13057 | 2605 |
displayLineFromX:(width - 1) |
| 9985 | 2606 |
y:y |
| 13057 | 2607 |
toX:(width - 1) |
| 9985 | 2608 |
y:(y+h). |
2609 |
||
| 13091 | 2610 |
self paint:savPaint. |
2611 |
||
| 9985 | 2612 |
"Created: / 14-12-2009 / 13:15:53 / Jindra <a>" |
2613 |
"Modified: / 14-12-2009 / 15:09:54 / Jindra <a>" |
|
| 10577 | 2614 |
"Modified: / 17-08-2011 / 15:12:47 / cg" |
| 10781 | 2615 |
"Modified (comment): / 07-10-2011 / 19:37:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 2616 |
! |
2617 |
||
2618 |
redrawLine:line |
|
2619 |
||
2620 |
^self redrawLine:line cleared: false. |
|
2621 |
||
2622 |
"Modified: / 17-06-2011 / 14:12:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2623 |
! |
|
2624 |
||
2625 |
redrawLine:line cleared: cleared |
|
2626 |
"redraws specified line. Returns width of drawn object. Color of drawn objects should be taken from lineFont, lineColor" |
|
2627 |
||
| 13057 | 2628 |
^ self redrawLine:line cleared:cleared drawServices:true |
2629 |
! |
|
2630 |
||
2631 |
redrawLine:line cleared:cleared drawServices:drawServices |
|
| 13813 | 2632 |
"redraws specified line. Returns width of drawn object. |
| 13213 | 2633 |
Color of drawn objects should be taken from lineFont, lineColor" |
| 13813 | 2634 |
|
| 13213 | 2635 |
|lineString yTop yBaseline fontAscent fontDescent |
| 14520 | 2636 |
textW requiredW oldFont newFont oldColor newColor myFont| |
| 9985 | 2637 |
|
| 13813 | 2638 |
shown ifFalse:[ ^ self ]. "/ Do not bother if the view is not shown. |
| 13574 | 2639 |
textView isNil ifTrue:[^ self]. "/ happens when shown in UIPainter |
2640 |
||
| 13567 | 2641 |
requiredW := self width. |
| 14520 | 2642 |
myFont := gc font. |
| 13567 | 2643 |
|
2644 |
showLineNumbers ifTrue:[ |
|
| 13942 | 2645 |
lineString := self displayedString:line. |
2646 |
||
2647 |
textW := (lineString widthOn:self). |
|
2648 |
requiredW := textW + self padding. |
|
2649 |
||
| 14520 | 2650 |
oldFont := myFont. |
| 13942 | 2651 |
oldColor := self paint. |
2652 |
||
2653 |
newFont := self lineFontForLine:line. |
|
2654 |
newFont isNil ifTrue:[ |
|
2655 |
newFont := oldFont. |
|
2656 |
newColor := self lineColorForLine:line. |
|
|
13943
510f0343785e
Fixes off-by-one error when drawing annotations.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13942
diff
changeset
|
2657 |
newColor notNil ifTrue:[ self paint:newColor ]. |
| 13942 | 2658 |
]. |
2659 |
newFont ~~ oldFont ifTrue:[ |
|
2660 |
"/ ensure that the line number lines are not higher than the text lines |
|
|
14145
78c992303423
Access graphicsDevice via method send instead of instVar access
Stefan Vogel <sv@exept.de>
parents:
14127
diff
changeset
|
2661 |
(newFont heightOn:self graphicsDevice) > (textView font heightOn:self graphicsDevice) ifTrue:[ |
| 13942 | 2662 |
newFont := textView font. |
2663 |
]. |
|
2664 |
newFont ~~ oldFont ifTrue:[ |
|
| 14520 | 2665 |
self font:newFont. |
2666 |
myFont := gc font. |
|
| 13942 | 2667 |
]. |
2668 |
]. |
|
|
11424
69b3960c7757
care for small text-font in gutterview
Claus Gittinger <cg@exept.de>
parents:
11398
diff
changeset
|
2669 |
]. |
| 9985 | 2670 |
|
| 13962 | 2671 |
fontAscent := textView font ascentOn:self graphicsDevice. |
2672 |
fontDescent := textView font descentOn:self graphicsDevice. |
|
| 13574 | 2673 |
|
|
13943
510f0343785e
Fixes off-by-one error when drawing annotations.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13942
diff
changeset
|
2674 |
|
| 13584 | 2675 |
yTop := (self yOfTextViewLine:line) ? 0. |
| 13574 | 2676 |
yBaseline := yTop + fontAscent. |
2677 |
||
| 9985 | 2678 |
cleared ifFalse:[ |
| 14520 | 2679 |
self clearRectangleX:0 y:yBaseline - myFont ascent |
| 13962 | 2680 |
width:width - 2 |
| 14520 | 2681 |
height:myFont ascent + myFont descent. |
| 9985 | 2682 |
]. |
2683 |
||
| 13057 | 2684 |
"/ cg: this should be done differently: services know about the |
2685 |
"/ gutter, so they should respond to a special drawGutter message. |
|
| 13105 | 2686 |
"/ otherwise, some redraws become unusably slow (especially |
| 13057 | 2687 |
"/ with multiple fonts/colors/emphases)... |
2688 |
drawServices ifTrue:[ |
|
| 13942 | 2689 |
"Let services draw annotations and other stuff" |
2690 |
codeView notNil ifTrue:[ |
|
2691 |
codeView |
|
2692 |
drawLine:line in: self |
|
| 14520 | 2693 |
atX: self acceptCancelRight + 1 y:yBaseline width: widthAnnotations height:myFont height |
| 13942 | 2694 |
from:nil to:nil with:self paint and: self backgroundColor. |
2695 |
] |
|
| 13057 | 2696 |
]. |
| 9985 | 2697 |
|
| 13567 | 2698 |
showLineNumbers ifTrue:[ |
| 13942 | 2699 |
self |
2700 |
displayString:lineString |
|
|
13943
510f0343785e
Fixes off-by-one error when drawing annotations.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13942
diff
changeset
|
2701 |
x:width - widthDiffInfo - textW |
| 13942 | 2702 |
y:yBaseline. |
|
13943
510f0343785e
Fixes off-by-one error when drawing annotations.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13942
diff
changeset
|
2703 |
newFont notNil ifTrue:[ |
|
510f0343785e
Fixes off-by-one error when drawing annotations.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13942
diff
changeset
|
2704 |
self font:oldFont. |
|
510f0343785e
Fixes off-by-one error when drawing annotations.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13942
diff
changeset
|
2705 |
self paint:oldColor |
|
510f0343785e
Fixes off-by-one error when drawing annotations.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13942
diff
changeset
|
2706 |
] ifFalse:[ |
|
510f0343785e
Fixes off-by-one error when drawing annotations.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13942
diff
changeset
|
2707 |
newColor notNil ifTrue:[ self paint:oldColor ]. |
|
510f0343785e
Fixes off-by-one error when drawing annotations.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13942
diff
changeset
|
2708 |
]. |
| 13567 | 2709 |
]. |
2710 |
||
| 13813 | 2711 |
"/ If the view has been cleared here, we have also to redraw corresponding portion |
2712 |
"/ of accept/cancel bar !! |
|
2713 |
cleared ifFalse:[ |
|
| 13942 | 2714 |
"/ In that case it was cleared above. |
| 13962 | 2715 |
self redrawAcceptCancelBarX:0 y:yBaseline - gc font ascent |
2716 |
width:width - 2 |
|
2717 |
height:gc font ascent + gc font descent. |
|
| 13813 | 2718 |
]. |
| 9985 | 2719 |
^ requiredW. |
2720 |
||
2721 |
"Modified: / 14-12-2009 / 15:30:44 / Jindra <a>" |
|
2722 |
"Created: / 17-06-2011 / 14:11:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11606 | 2723 |
"Modified: / 18-07-2012 / 19:05:24 / cg" |
|
13943
510f0343785e
Fixes off-by-one error when drawing annotations.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13942
diff
changeset
|
2724 |
"Modified: / 14-02-2014 / 17:58:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 2725 |
! |
2726 |
||
| 10224 | 2727 |
redrawLinesFrom:start |
| 13057 | 2728 |
"/ cg: obsolete? |
| 10312 | 2729 |
start to: (textView lastLineShown - 1 min: textView list size) do:[:line| |
| 14520 | 2730 |
self redrawLine:line cleared:false drawServices:true. |
| 10224 | 2731 |
] |
2732 |
||
2733 |
"Created: / 06-07-2011 / 17:25:36 / jv" |
|
| 10312 | 2734 |
"Modified: / 12-07-2011 / 17:14:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10224 | 2735 |
! |
2736 |
||
| 13374 | 2737 |
redrawVisibleLine:line |
2738 |
|absLine| |
|
2739 |
||
2740 |
(absLine := textView visibleLineToListLine:line) notNil ifTrue:[ |
|
2741 |
self redrawLine:absLine cleared: false. |
|
2742 |
]. |
|
2743 |
||
2744 |
"Modified: / 17-06-2011 / 14:12:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2745 |
! |
|
2746 |
||
| 13105 | 2747 |
redrawX:x y:y width:w height:h |
| 13213 | 2748 |
|firstLine lastLine yBot| |
2749 |
||
| 9985 | 2750 |
self redrawBackgroundX:x y:y width:w height:h. |
|
10793
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
2751 |
|
| 13567 | 2752 |
(codeView notNil and:[codeView showAcceptCancelBar]) ifTrue:[ |
|
10793
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
2753 |
self redrawAcceptCancelBarX:x y:y width:w height:h. |
|
c19380a197aa
Added channel for controlling visibility of accept/cancel
vrany
parents:
10791
diff
changeset
|
2754 |
]. |
| 9985 | 2755 |
|
| 13575 | 2756 |
"/ textview may be nil, if Gutter is shown in the UIPainter!! |
2757 |
textView notNil ifTrue:[ |
|
2758 |
numberOfLines := (textView list size max:textView cursorLine). |
|
2759 |
yBot := y + h. |
|
2760 |
firstLine := textView visibleLineToAbsoluteLine:(textView visibleLineOfY:y). |
|
2761 |
lastLine := textView visibleLineToAbsoluteLine:(textView visibleLineOfY:yBot-1). |
|
2762 |
lastLine := lastLine min:numberOfLines. |
|
2763 |
||
2764 |
firstLine to:lastLine do: [:line | |
|
2765 |
self redrawLine:line cleared:true drawServices:true. |
|
2766 |
]. |
|
| 13567 | 2767 |
] |
| 9985 | 2768 |
! ! |
2769 |
||
2770 |
!CodeView2::TextView methodsFor:'accessing'! |
|
2771 |
||
2772 |
changedDiffText |
|
2773 |
^ changedDiffText |
|
2774 |
! |
|
2775 |
||
2776 |
changedDiffText:something |
|
2777 |
changedDiffText := something. |
|
2778 |
! |
|
2779 |
||
2780 |
changedLines |
|
2781 |
^ changedLines |
|
2782 |
||
2783 |
"Created: / 26-04-2010 / 20:30:32 / Jakub <zelenja7@fel.cvut.cz>" |
|
2784 |
"Modified: / 26-04-2010 / 21:48:13 / Jakub <zelenja7@fel.cvut.cz>" |
|
2785 |
! |
|
2786 |
||
2787 |
changedLines:something |
|
2788 |
changedLines := something. |
|
2789 |
||
2790 |
"Created: / 26-04-2010 / 20:30:19 / Jakub <zelenja7@fel.cvut.cz>" |
|
2791 |
"Modified: / 02-05-2010 / 19:13:32 / Jakub <zelenja7@fel.cvut.cz>" |
|
2792 |
! |
|
2793 |
||
| 10781 | 2794 |
contents: text |
2795 |
||
2796 |
super contents: text. |
|
2797 |
reallyModifiedChannel value: false. |
|
2798 |
||
2799 |
"Created: / 07-10-2011 / 20:32:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2800 |
! |
|
2801 |
||
| 13813 | 2802 |
contents: text clear: clearPrevious |
2803 |
||
2804 |
| savedListOriginal | |
|
2805 |
savedListOriginal := listOriginal. |
|
2806 |
super contents: text. |
|
2807 |
listOriginal := savedListOriginal. |
|
2808 |
self updateReallyModified. |
|
2809 |
||
2810 |
"Created: / 17-02-2012 / 00:35:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2811 |
! |
|
2812 |
||
| 9985 | 2813 |
deletedLines |
2814 |
^ deletedLines |
|
2815 |
||
2816 |
"Modified: / 26-04-2010 / 21:48:23 / Jakub <zelenja7@fel.cvut.cz>" |
|
2817 |
! |
|
2818 |
||
| 11597 | 2819 |
deletedLines:something |
2820 |
deletedLines := something. |
|
| 9985 | 2821 |
|
2822 |
"Modified: / 26-04-2010 / 21:48:54 / Jakub <zelenja7@fel.cvut.cz>" |
|
| 11597 | 2823 |
"Modified (format): / 17-07-2012 / 18:56:44 / cg" |
| 9985 | 2824 |
! |
2825 |
||
2826 |
diffMode |
|
2827 |
^ diffMode |
|
2828 |
! |
|
2829 |
||
2830 |
diffMode:something |
|
2831 |
diffMode := something. |
|
2832 |
! |
|
2833 |
||
2834 |
emptyLines |
|
2835 |
^ emptyLines |
|
2836 |
! |
|
2837 |
||
2838 |
emptyLines:something |
|
2839 |
emptyLines := something. |
|
2840 |
! |
|
2841 |
||
| 13813 | 2842 |
fontAscent |
2843 |
^fontAscent notNil ifTrue:[fontAscent] ifFalse:[super fontAscent] |
|
2844 |
||
2845 |
"Created: / 19-05-2012 / 14:13:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2846 |
! |
|
2847 |
||
| 9985 | 2848 |
insertedLines |
2849 |
^ insertedLines |
|
2850 |
||
2851 |
"Modified: / 26-04-2010 / 21:48:27 / Jakub <zelenja7@fel.cvut.cz>" |
|
2852 |
! |
|
2853 |
||
| 11597 | 2854 |
insertedLines:something |
2855 |
insertedLines := something. |
|
| 9985 | 2856 |
|
2857 |
"Modified: / 26-04-2010 / 21:48:59 / Jakub <zelenja7@fel.cvut.cz>" |
|
| 11597 | 2858 |
"Modified (format): / 17-07-2012 / 18:56:50 / cg" |
| 9985 | 2859 |
! |
2860 |
||
| 10245 | 2861 |
modifiedChannel: aValueHolder |
2862 |
||
2863 |
super modifiedChannel: aValueHolder |
|
2864 |
||
2865 |
"Created: / 07-07-2011 / 12:27:11 / Jan Vrany <jan.vrant@fit.cvut,cz>" |
|
2866 |
! |
|
2867 |
||
| 9985 | 2868 |
originDiffText |
2869 |
^ originDiffText |
|
2870 |
! |
|
2871 |
||
2872 |
originDiffText:something |
|
2873 |
originDiffText := something. |
|
| 10781 | 2874 |
! |
2875 |
||
2876 |
reallyModified |
|
2877 |
||
2878 |
^self reallyModifiedChannel value |
|
2879 |
||
2880 |
"Created: / 07-10-2011 / 19:28:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 9985 | 2881 |
! ! |
2882 |
||
| 11393 | 2883 |
!CodeView2::TextView methodsFor:'accessing-colors'! |
| 9985 | 2884 |
|
2885 |
colorChanged |
|
2886 |
^ Color redByte:240 greenByte: 192 blueByte: 192 |
|
2887 |
||
2888 |
"Modified: / 24-06-2010 / 14:05:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2889 |
! |
|
2890 |
||
2891 |
colorDeleted |
|
2892 |
^ self colorInserted. |
|
2893 |
"/^ Color pink |
|
2894 |
||
2895 |
"Modified: / 24-06-2010 / 14:16:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10781 | 2896 |
"Modified (format): / 07-10-2011 / 20:26:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 11597 | 2897 |
"Modified (format): / 17-07-2012 / 18:57:14 / cg" |
| 9985 | 2898 |
! |
2899 |
||
2900 |
colorInserted |
|
2901 |
^ Color redByte: 239 greenByte: 225 blueByte: 152 |
|
2902 |
||
2903 |
"Modified: / 24-06-2010 / 14:13:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2904 |
! ! |
|
2905 |
||
| 10781 | 2906 |
!CodeView2::TextView methodsFor:'accessing-contents'! |
2907 |
||
| 10784 | 2908 |
list:aCollection expandTabs:expand scanForNonStrings:scan includesNonStrings:nonStrings |
2909 |
||
2910 |
super list:aCollection expandTabs:expand scanForNonStrings:scan includesNonStrings:nonStrings. |
|
| 13517 | 2911 |
|
| 10784 | 2912 |
listOriginal := aCollection copy. |
| 10834 | 2913 |
reallyModifiedChannel value: false. |
| 13813 | 2914 |
|
2915 |
"/JV: used to be notifyLines... but that method |
|
2916 |
"/ leaves suppressNotifications to true, which is not what |
|
2917 |
"/ we want!! |
|
2918 |
self updateReallyModified. |
|
2919 |
codeView linesModifiedFrom: 1 to: list size. |
|
| 10784 | 2920 |
|
2921 |
"Created: / 08-10-2011 / 12:23:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 13813 | 2922 |
"Modified (comment): / 03-08-2013 / 13:35:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10784 | 2923 |
! |
2924 |
||
| 10781 | 2925 |
setList:aCollection expandTabs:expandTabs redraw:doRedraw |
2926 |
||
2927 |
super setList:aCollection expandTabs:expandTabs redraw:doRedraw. |
|
2928 |
listOriginal := aCollection copy. |
|
| 10834 | 2929 |
reallyModifiedChannel value: false. |
| 13813 | 2930 |
|
2931 |
"/JV: used to be notifyLines... but that method |
|
2932 |
"/ leaves suppressNotifications to true, which is not what |
|
2933 |
"/ we want!! |
|
2934 |
self updateReallyModified. |
|
2935 |
codeView linesModifiedFrom: 1 to: list size. |
|
| 10781 | 2936 |
|
2937 |
"Created: / 07-10-2011 / 18:42:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 13813 | 2938 |
"Modified (comment): / 03-08-2013 / 13:35:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2939 |
! ! |
|
2940 |
||
2941 |
!CodeView2::TextView methodsFor:'accessing-look'! |
|
2942 |
||
2943 |
lineSpacing |
|
2944 |
||
2945 |
^lineSpacing |
|
2946 |
||
2947 |
"Modified: / 22-05-1996 / 12:22:29 / cg" |
|
2948 |
"Created: / 19-03-2012 / 13:22:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10781 | 2949 |
! ! |
2950 |
||
| 10785 | 2951 |
!CodeView2::TextView methodsFor:'accessing-state'! |
2952 |
||
2953 |
beUnmodified |
|
2954 |
||
2955 |
self modifiedChannel value: false. |
|
2956 |
reallyModifiedChannel value: false. |
|
2957 |
listOriginal := list copy. |
|
2958 |
||
2959 |
"Created: / 08-10-2011 / 12:51:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2960 |
! |
|
2961 |
||
2962 |
isModified |
|
2963 |
||
2964 |
^self modified |
|
2965 |
||
2966 |
"Created: / 08-10-2011 / 12:52:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2967 |
! |
|
2968 |
||
2969 |
isReallyModified |
|
2970 |
||
2971 |
^self reallyModified |
|
2972 |
||
2973 |
"Created: / 08-10-2011 / 12:52:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2974 |
! ! |
|
2975 |
||
| 13813 | 2976 |
!CodeView2::TextView methodsFor:'bit blitting'! |
2977 |
||
2978 |
copyFrom:aDrawable x:srcX y:srcY toX:dstX y:dstY width:w height:h async:async |
|
| 13942 | 2979 |
|
2980 |
"/ If doing a vertical scroll, optimized Gutter redraw by |
|
2981 |
"/ copying gutter's image... |
|
2982 |
(scrollInProgress and:[aDrawable == self]) ifTrue:[ |
|
2983 |
"/ Vertical scroll? |
|
2984 |
((srcY ~= dstY) and:[srcX = dstX]) ifTrue:[ |
|
2985 |
"/ Do copy in gutter, but not accept-cancel bar!! |
|
2986 |
| x0 | |
|
2987 |
||
2988 |
x0 := gutterView acceptCancelRight. |
|
2989 |
gutterView |
|
2990 |
copyFrom:gutterView |
|
2991 |
x:x0 |
|
2992 |
y:srcY |
|
2993 |
toX:x0 |
|
2994 |
y:dstY |
|
2995 |
width:(gutterView width - x0) |
|
2996 |
height:h |
|
2997 |
async:false |
|
2998 |
] |
|
| 13813 | 2999 |
]. |
3000 |
^ super |
|
| 13942 | 3001 |
copyFrom:aDrawable x:srcX y:srcY toX:dstX y:dstY width:w height:h async:async |
3002 |
||
3003 |
"Modified: / 14-02-2014 / 10:15:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 13813 | 3004 |
! ! |
3005 |
||
| 10781 | 3006 |
!CodeView2::TextView methodsFor:'channels'! |
3007 |
||
3008 |
reallyModifiedChannel |
|
| 13567 | 3009 |
"return the valueHolder holding true if text was really modified. |
3010 |
This is different from #modified, as the inherited modified flag is cleared |
|
3011 |
to trigger another change notification with every keystroke (for the syntaxHighighter). |
|
3012 |
This may be (now) considered a very bad hack" |
|
| 10781 | 3013 |
|
3014 |
^ reallyModifiedChannel |
|
3015 |
||
3016 |
"Created: / 07-10-2011 / 18:50:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3017 |
! |
|
3018 |
||
3019 |
reallyModifiedChannel: aValueModel |
|
3020 |
||
3021 |
|prev| |
|
3022 |
||
3023 |
prev := reallyModifiedChannel. |
|
3024 |
prev notNil ifTrue:[ |
|
3025 |
gutterView notNil ifTrue:[ |
|
3026 |
reallyModifiedChannel removeDependent: gutterView. |
|
3027 |
] |
|
3028 |
]. |
|
3029 |
reallyModifiedChannel := aValueModel. |
|
3030 |
self setupChannel:aValueModel for:nil withOld:prev. |
|
3031 |
gutterView notNil ifTrue:[ |
|
3032 |
reallyModifiedChannel addDependent: gutterView. |
|
3033 |
] |
|
3034 |
||
3035 |
"Created: / 07-10-2011 / 18:50:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3036 |
! ! |
|
3037 |
||
|
12354
8aac48d63ded
changed default for Jan's quick menus to use the ALT button isntead
Claus Gittinger <cg@exept.de>
parents:
12347
diff
changeset
|
3038 |
!CodeView2::TextView methodsFor:'delegation-events'! |
|
8aac48d63ded
changed default for Jan's quick menus to use the ALT button isntead
Claus Gittinger <cg@exept.de>
parents:
12347
diff
changeset
|
3039 |
|
|
8aac48d63ded
changed default for Jan's quick menus to use the ALT button isntead
Claus Gittinger <cg@exept.de>
parents:
12347
diff
changeset
|
3040 |
isQuickMenuModifierPressed |
|
8aac48d63ded
changed default for Jan's quick menus to use the ALT button isntead
Claus Gittinger <cg@exept.de>
parents:
12347
diff
changeset
|
3041 |
UserPreferences current codeView2QuickSendersAndImplementorsOnControl ifTrue:[ |
| 13942 | 3042 |
^ self sensor ctrlDown |
|
12354
8aac48d63ded
changed default for Jan's quick menus to use the ALT button isntead
Claus Gittinger <cg@exept.de>
parents:
12347
diff
changeset
|
3043 |
]. |
| 13813 | 3044 |
^ self sensor metaDown |
|
12354
8aac48d63ded
changed default for Jan's quick menus to use the ALT button isntead
Claus Gittinger <cg@exept.de>
parents:
12347
diff
changeset
|
3045 |
! |
|
8aac48d63ded
changed default for Jan's quick menus to use the ALT button isntead
Claus Gittinger <cg@exept.de>
parents:
12347
diff
changeset
|
3046 |
|
|
8aac48d63ded
changed default for Jan's quick menus to use the ALT button isntead
Claus Gittinger <cg@exept.de>
parents:
12347
diff
changeset
|
3047 |
isQuickMenuModifierReleased |
|
8aac48d63ded
changed default for Jan's quick menus to use the ALT button isntead
Claus Gittinger <cg@exept.de>
parents:
12347
diff
changeset
|
3048 |
UserPreferences current codeView2QuickSendersAndImplementorsOnControl ifTrue:[ |
|
8aac48d63ded
changed default for Jan's quick menus to use the ALT button isntead
Claus Gittinger <cg@exept.de>
parents:
12347
diff
changeset
|
3049 |
^ self sensor ctrlDown not |
|
8aac48d63ded
changed default for Jan's quick menus to use the ALT button isntead
Claus Gittinger <cg@exept.de>
parents:
12347
diff
changeset
|
3050 |
]. |
|
8aac48d63ded
changed default for Jan's quick menus to use the ALT button isntead
Claus Gittinger <cg@exept.de>
parents:
12347
diff
changeset
|
3051 |
^ self sensor metaDown not |
|
8aac48d63ded
changed default for Jan's quick menus to use the ALT button isntead
Claus Gittinger <cg@exept.de>
parents:
12347
diff
changeset
|
3052 |
! ! |
|
8aac48d63ded
changed default for Jan's quick menus to use the ALT button isntead
Claus Gittinger <cg@exept.de>
parents:
12347
diff
changeset
|
3053 |
|
| 9985 | 3054 |
!CodeView2::TextView methodsFor:'drawing'! |
3055 |
||
| 13813 | 3056 |
backgroundForVisibleLine:visLineNr default:bg |
3057 |
| lineNr | |
|
3058 |
||
3059 |
||
3060 |
diffMode ifTrue:[ |
|
| 13942 | 3061 |
lineNr := self visibleLineToListLine:visLineNr. |
3062 |
(insertedLines notEmptyOrNil and:[insertedLines includes:lineNr]) ifTrue:[ |
|
3063 |
^self colorInserted |
|
3064 |
]. |
|
3065 |
(changedLines notEmptyOrNil and:[changedLines includes:lineNr]) ifTrue:[ |
|
3066 |
^self colorChanged |
|
3067 |
]. |
|
3068 |
(deletedLines notEmptyOrNil and:[deletedLines includes:lineNr]) ifTrue:[ |
|
3069 |
^self colorDeleted |
|
3070 |
]. |
|
| 13813 | 3071 |
]. |
3072 |
^ bg |
|
3073 |
||
3074 |
"Modified: / 17-03-2012 / 12:22:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 9985 | 3075 |
! |
3076 |
||
| 13813 | 3077 |
drawFromVisibleLine:startVisLineNr to:endVisLineNr with:fg and:bg |
3078 |
"draw a visible line range in fg/bg" |
|
3079 |
||
3080 |
diffMode ifFalse:[ |
|
| 13942 | 3081 |
super drawFromVisibleLine:startVisLineNr to:endVisLineNr with:fg and:bg. |
3082 |
^self. |
|
| 13813 | 3083 |
]. |
3084 |
||
3085 |
startVisLineNr to: endVisLineNr do:[:visLineNr| |
|
| 13942 | 3086 |
self drawVisibleLine: visLineNr with:fg and:bg |
| 13813 | 3087 |
] |
3088 |
||
3089 |
"Modified: / 15-12-1999 / 23:19:39 / cg" |
|
3090 |
"Created: / 17-03-2012 / 09:44:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3091 |
! |
|
3092 |
||
3093 |
drawLine:line fromX:x inVisible:visLineNr with:fg and:bg |
|
3094 |
super |
|
| 13942 | 3095 |
drawLine:line |
3096 |
fromX:x |
|
3097 |
inVisible:visLineNr |
|
3098 |
with:fg |
|
3099 |
and:(self backgroundForVisibleLine:visLineNr default:bg). |
|
| 9985 | 3100 |
|
3101 |
"Created: / 05-04-2010 / 12:07:07 / Jakub <zelenja7@fel.cvut.cz>" |
|
3102 |
"Modified: / 02-05-2010 / 18:46:00 / Jakub <zelenja7@fel.cvut.cz>" |
|
| 13813 | 3103 |
"Modified: / 17-03-2012 / 10:05:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 3104 |
! |
3105 |
||
| 13813 | 3106 |
drawLine:lineStringArg inVisible:visLineNr col:col with:fg and:bg |
3107 |
super |
|
| 13942 | 3108 |
drawLine:lineStringArg |
3109 |
inVisible:visLineNr |
|
3110 |
col:col |
|
3111 |
with:fg |
|
3112 |
and:(self backgroundForVisibleLine:visLineNr default:bg). |
|
| 9985 | 3113 |
|
3114 |
"Created: / 05-04-2010 / 11:49:42 / Jakub <zelenja7@fel.cvut.cz>" |
|
3115 |
"Modified: / 02-05-2010 / 18:45:56 / Jakub <zelenja7@fel.cvut.cz>" |
|
| 13813 | 3116 |
"Modified: / 17-03-2012 / 10:04:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 3117 |
! |
3118 |
||
| 13813 | 3119 |
drawLine:lineStringArg inVisible:visLineNr from:startCol to:endColOrNil with:fg and:bg |
3120 |
super |
|
| 13942 | 3121 |
drawLine:lineStringArg |
3122 |
inVisible:visLineNr |
|
3123 |
from:startCol |
|
3124 |
to:endColOrNil |
|
3125 |
with:fg |
|
3126 |
and:(self backgroundForVisibleLine:visLineNr default:bg). |
|
| 9985 | 3127 |
|
3128 |
"Created: / 05-04-2010 / 11:54:54 / Jakub <zelenja7@fel.cvut.cz>" |
|
3129 |
"Modified: / 02-05-2010 / 18:45:52 / Jakub <zelenja7@fel.cvut.cz>" |
|
| 13813 | 3130 |
"Modified: / 17-03-2012 / 10:04:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 3131 |
! |
3132 |
||
| 13813 | 3133 |
drawLine:lineString inVisible:visLineNr from:startCol with:fg and:bg |
3134 |
super |
|
| 13942 | 3135 |
drawLine:lineString |
3136 |
inVisible:visLineNr |
|
3137 |
from:startCol |
|
3138 |
with:fg |
|
3139 |
and:(self backgroundForVisibleLine:visLineNr default:bg). |
|
| 9985 | 3140 |
|
3141 |
"Created: / 05-04-2010 / 11:54:26 / Jakub <zelenja7@fel.cvut.cz>" |
|
3142 |
"Modified: / 02-05-2010 / 18:45:48 / Jakub <zelenja7@fel.cvut.cz>" |
|
| 13813 | 3143 |
"Modified: / 17-03-2012 / 10:04:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 3144 |
! |
3145 |
||
| 13813 | 3146 |
drawVisibleLine:visLineNr with:fg and:bg |
3147 |
super |
|
| 13942 | 3148 |
drawVisibleLine:visLineNr |
3149 |
with:fg |
|
3150 |
and:(self backgroundForVisibleLine:visLineNr default:bg). |
|
| 9985 | 3151 |
|
3152 |
"Created: / 05-04-2010 / 11:49:42 / Jakub <zelenja7@fel.cvut.cz>" |
|
3153 |
"Modified: / 02-05-2010 / 18:45:44 / Jakub <zelenja7@fel.cvut.cz>" |
|
| 13813 | 3154 |
"Modified: / 17-03-2012 / 10:04:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 3155 |
! |
3156 |
||
3157 |
redrawLines |
|
| 13374 | 3158 |
"redraw diff lines" |
3159 |
||
| 9985 | 3160 |
|i pom| |
3161 |
||
3162 |
diffMode ifFalse:[^self]. |
|
| 13813 | 3163 |
true ifTrue:[^self]. |
3164 |
||
| 9985 | 3165 |
pom := self hasSelection. |
3166 |
(pom) ifTrue:[ ^ self. ]. |
|
| 12992 | 3167 |
|
| 14369 | 3168 |
"/ cg: how about |
3169 |
"/ deletedLines select:[:l | l size > 0] thenDo:[...] ? |
|
| 9985 | 3170 |
i := 1. |
| 14369 | 3171 |
[ i <= (deletedLines size) ] whileTrue:[ |
| 13942 | 3172 |
((deletedLines at:i) > 0) ifTrue:[ |
3173 |
super |
|
3174 |
drawVisibleLine:(deletedLines at:i) |
|
3175 |
with:fgColor |
|
3176 |
and:self colorDeleted. |
|
3177 |
]. |
|
3178 |
i := i + 1. |
|
| 9985 | 3179 |
]. |
| 14369 | 3180 |
|
3181 |
"/ cg: how about |
|
3182 |
"/ insertedLines select:[:l | l size > 0] thenDo:[...] ? |
|
| 9985 | 3183 |
i := 1. |
| 14369 | 3184 |
[ i <= (insertedLines size) ] whileTrue:[ |
| 13942 | 3185 |
((insertedLines at:i) > 0) ifTrue:[ |
3186 |
super |
|
3187 |
drawVisibleLine:(insertedLines at:i) |
|
3188 |
with:fgColor |
|
3189 |
and:self colorInserted. |
|
3190 |
]. |
|
3191 |
i := i + 1. |
|
| 9985 | 3192 |
]. |
| 14369 | 3193 |
|
3194 |
"/ cg: how about |
|
3195 |
"/ changedLines select:[:l | l size > 0] thenDo:[...] ? |
|
| 9985 | 3196 |
i := 1. |
| 14369 | 3197 |
[ i <= (changedLines size) ] whileTrue:[ |
| 13942 | 3198 |
((changedLines at:i) > 0) ifTrue:[ |
3199 |
super |
|
3200 |
drawVisibleLine:(changedLines at:i) |
|
3201 |
with:fgColor |
|
3202 |
and:self colorChanged. |
|
3203 |
]. |
|
3204 |
i := i + 1. |
|
| 9985 | 3205 |
]. |
3206 |
||
3207 |
"Created: / 26-04-2010 / 21:04:31 / Jakub <zelenja7@fel.cvut.cz>" |
|
3208 |
"Modified: / 22-06-2010 / 23:28:30 / Jakub <zelenja7@fel.cvut.cz>" |
|
| 13813 | 3209 |
"Modified: / 17-03-2012 / 09:27:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 3210 |
! ! |
3211 |
||
3212 |
!CodeView2::TextView methodsFor:'editing'! |
|
3213 |
||
3214 |
contentsChanged |
|
| 13051 | 3215 |
"this one is sent, whenever contents changes its size" |
3216 |
||
| 9985 | 3217 |
super contentsChanged. |
| 13057 | 3218 |
|
3219 |
"/ codeView diffMode ifTrue:[ |
|
3220 |
"/ changedDiffText ifTrue:[ |
|
3221 |
"/ codeView recomputeDiff:self. |
|
3222 |
"/ ] ifFalse:[ |
|
3223 |
"/ changedDiffText := true. |
|
3224 |
"/ ]. |
|
3225 |
"/ ] |
|
3226 |
||
| 9985 | 3227 |
|
3228 |
"Created: / 22-06-2010 / 23:13:24 / Jakub <zelenja7@fel.cvut.cz>" |
|
3229 |
"Modified: / 01-08-2010 / 20:33:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3230 |
! |
|
3231 |
||
|
10971
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3232 |
deleteCharBeforeCursor |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3233 |
"delete single character to the left of cursor and move cursor to left" |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3234 |
|
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3235 |
"BIG FAT WARNING: This method is copied from TextEditView, |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3236 |
the fix should be there, but someone smarter should review it |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3237 |
before the patch will be pushed up" |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3238 |
|
| 12787 | 3239 |
|soCol wasOn lineNrAboveCursor ln originalLine prevTab| |
|
10971
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3240 |
|
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3241 |
wasOn := self hideCursor. |
| 12787 | 3242 |
|
| 12783 | 3243 |
"JV@2012-01-06: Do not play with autoindent iff cursor is at the very beginning of the line" |
| 12787 | 3244 |
(autoIndent |
3245 |
and:[cursorCol ~~ 1 |
|
3246 |
and:[ (tabPositions includes:cursorCol) |
|
3247 |
]]) ifTrue:[ |
|
|
10971
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3248 |
prevTab := (self prevTabBefore:cursorCol) max:1. |
| 12782 | 3249 |
"JV@2011-12-10: The list can be shorter than cursorLine, |
|
10971
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3250 |
trailing because empty lines are not physically in the list." |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3251 |
(list size >= cursorLine) ifTrue:[ |
| 12787 | 3252 |
ln := originalLine := (list at:cursorLine) ? ''. |
|
10971
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3253 |
] ifFalse:[ |
| 12787 | 3254 |
ln := originalLine := ''. |
|
10971
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3255 |
]. |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3256 |
ln size < prevTab ifTrue:[ |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3257 |
ln := ln , (String new:prevTab withAll:Character space). |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3258 |
]. |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3259 |
(ln copyTo:prevTab) isBlank ifTrue:[ |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3260 |
(ln copyFrom:prevTab+1) isBlank ifTrue:[ |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3261 |
cursorCol > prevTab ifTrue:[ |
| 12787 | 3262 |
self st80EditMode ifTrue:[ |
3263 |
"/ ensure that there is no conflict here: st80EditMode will |
|
3264 |
"/ not allow a cursor position beyond the end of line, |
|
3265 |
"/ so avoid that cursorLine:col: will force us to the beginning of the line |
|
3266 |
originalLine size < prevTab ifTrue:[ |
|
| 12797 | 3267 |
self at:cursorLine put:ln |
| 12787 | 3268 |
] |
3269 |
]. |
|
|
10971
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3270 |
self cursorLine:cursorLine col:prevTab. |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3271 |
wasOn ifTrue:[ self showCursor ]. |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3272 |
^ self |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3273 |
]. |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3274 |
] ifFalse:[ |
| 12787 | 3275 |
"/ (ln copyFrom:prevTab+1 to:cursorCol-1) isBlank ifTrue:[ |
| 12782 | 3276 |
self deleteFromLine:cursorLine col:prevTab toLine:cursorLine col:cursorCol-1. |
3277 |
self cursorLine:cursorLine col:prevTab. |
|
3278 |
wasOn ifTrue:[ self showCursor ]. |
|
3279 |
^ self. |
|
| 12787 | 3280 |
"/ ] |
|
10971
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3281 |
] |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3282 |
]. |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3283 |
]. |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3284 |
|
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3285 |
"/ (autoIndent |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3286 |
"/ and:[cursorCol ~~ 1 |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3287 |
"/ and:[cursorLine <= (list size)]]) |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3288 |
"/ ifTrue:[ |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3289 |
"/ soCol := (self leftIndentForLine:cursorLine) + 1. |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3290 |
"/ |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3291 |
"/ (cursorCol == soCol and:[soCol > 1]) ifTrue:[ |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3292 |
"/ ln := list at:cursorLine. |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3293 |
"/ (ln notNil and:[(ln indexOfNonSeparatorStartingAt:1) < soCol]) ifTrue:[ |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3294 |
"/ soCol := 1 |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3295 |
"/ ] |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3296 |
"/ ] |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3297 |
"/ ] ifFalse:[ |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3298 |
soCol := 1. |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3299 |
"/ ]. |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3300 |
|
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3301 |
(cursorCol ~~ soCol and:[cursorCol ~~ 1]) ifTrue:[ |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3302 |
" |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3303 |
somewhere in the middle of a line |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3304 |
" |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3305 |
self cursorLeft. |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3306 |
self deleteCharAtLine:cursorLine col:cursorCol. |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3307 |
] ifFalse:[ |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3308 |
" |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3309 |
at begin of line - merge with previous line; |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3310 |
except for the very first line. |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3311 |
" |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3312 |
(cursorLine == 1) ifFalse:[ |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3313 |
lineNrAboveCursor := self validateCursorLine:(cursorLine - 1). |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3314 |
lineNrAboveCursor < cursorLine ifTrue:[ |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3315 |
(lineNrAboveCursor > 0 and:[lineNrAboveCursor > list size]) ifTrue:[ |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3316 |
"/ we are beyond the end of the text. |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3317 |
"/ move the cursor to the previous line. |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3318 |
self cursorLine:lineNrAboveCursor col:1. |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3319 |
] ifFalse:[ |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3320 |
self mergeLine:lineNrAboveCursor removeBlanks:false. |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3321 |
] |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3322 |
] |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3323 |
] |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3324 |
]. |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3325 |
wasOn ifTrue:[ self showCursor ] |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3326 |
|
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3327 |
"Modified: / 16-01-1998 / 22:33:04 / cg" |
|
11054
4a047a923805
fix for autoindent: deleting line when at the very beggining of the line
vrany
parents:
10977
diff
changeset
|
3328 |
"Modified: / 06-01-2012 / 12:42:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10971
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3329 |
! |
|
aee24a2ac4fd
Patch for #deleteCharBeforeCursor, should be moved to TextEditView
vrany
parents:
10970
diff
changeset
|
3330 |
|
| 9985 | 3331 |
getNewOriginText |
3332 |
|i size pole pom text helperText| |
|
3333 |
||
3334 |
i := 1. |
|
3335 |
pole := list. |
|
3336 |
size := list size. |
|
3337 |
text:=''. |
|
| 10877 | 3338 |
emptyLines isNil ifTrue:[emptyLines := #()]. |
| 9985 | 3339 |
[ i <= size ] whileTrue:[ |
3340 |
pom := emptyLines indexOf:i. |
|
3341 |
(pom = 0) ifFalse:[ |
|
3342 |
helperText := pole at:i. |
|
3343 |
(helperText = '') ifFalse:[ |
|
3344 |
(helperText isNil)ifTrue:[helperText:='']. |
|
3345 |
helperText:=helperText,Character cr. |
|
3346 |
text := text asString , helperText asString. |
|
3347 |
]. |
|
3348 |
] ifTrue:[ |
|
3349 |
helperText := pole at:i. |
|
3350 |
(helperText isNil)ifTrue:[helperText:='']. |
|
3351 |
helperText:=helperText,Character cr. |
|
3352 |
text := text asString , helperText asString. |
|
3353 |
]. |
|
3354 |
i:=i+1. |
|
3355 |
]. |
|
3356 |
^text |
|
3357 |
||
3358 |
"Created: / 22-06-2010 / 22:33:27 / Jakub <zelenja7@fel.cvut.cz>" |
|
3359 |
"Modified: / 24-06-2010 / 14:27:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10877 | 3360 |
"Modified: / 18-11-2011 / 14:58:22 / cg" |
| 9985 | 3361 |
! ! |
3362 |
||
3363 |
!CodeView2::TextView methodsFor:'editing-basic'! |
|
3364 |
||
|
10708
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3365 |
basicDeleteCharsAtLine:lineNr fromCol:startCol toCol:endCol |
|
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3366 |
"delete characters from startCol to endCol in line lineNr" |
|
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3367 |
|
| 10731 | 3368 |
super basicDeleteCharsAtLine:lineNr fromCol:startCol toCol:endCol. |
|
10708
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3369 |
self notifyLinesModifiedFrom: lineNr to: lineNr. |
|
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3370 |
|
|
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3371 |
"Created: / 16-09-2011 / 15:13:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3372 |
! |
|
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3373 |
|
|
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3374 |
basicDeleteFromLine:startLineNr toLine:endLineNr |
| 10728 | 3375 |
|
3376 |
super basicDeleteFromLine:startLineNr toLine:endLineNr. |
|
|
10708
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3377 |
self notifyLinesDeletedFrom:startLineNr to:endLineNr. |
| 9985 | 3378 |
|
3379 |
"Created: / 28-06-2011 / 09:09:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3380 |
! |
|
3381 |
||
3382 |
basicDeleteLineWithoutRedraw:lineNr |
|
3383 |
||
| 10728 | 3384 |
super basicDeleteLineWithoutRedraw:lineNr. |
3385 |
self notifyLinesDeletedFrom: lineNr to: lineNr. |
|
| 9985 | 3386 |
|
3387 |
"Created: / 28-06-2011 / 09:10:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3388 |
! |
|
3389 |
||
|
10708
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3390 |
basicInsert:aCharacter atLine:lineNr col:colNr |
|
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3391 |
"insert a single character at lineNr/colNr; |
|
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3392 |
set emphasis to character at current position" |
|
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3393 |
|
| 10728 | 3394 |
super basicInsert:aCharacter atLine:lineNr col:colNr. |
|
10708
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3395 |
self notifyLinesModifiedFrom: lineNr to: lineNr. |
|
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3396 |
|
|
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3397 |
"Created: / 16-09-2011 / 15:14:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3398 |
! |
|
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3399 |
|
| 9985 | 3400 |
basicMergeLine:lineNr removeBlanks:removeBlanks |
3401 |
||
| 10728 | 3402 |
super basicMergeLine:lineNr removeBlanks:removeBlanks. |
| 9985 | 3403 |
self notifyLinesDeletedFrom: lineNr + 1 to: lineNr + 1. |
3404 |
||
3405 |
"Created: / 28-06-2011 / 09:13:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3406 |
! |
|
3407 |
||
3408 |
basicSplitLine:lineNr before:colNr |
|
3409 |
||
| 10728 | 3410 |
super basicSplitLine:lineNr before:colNr. |
3411 |
self notifyLinesInsertedFrom: lineNr +1 to: lineNr + 1. |
|
| 9985 | 3412 |
|
3413 |
"Created: / 28-06-2011 / 09:14:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10977 | 3414 |
! |
3415 |
||
| 14439 | 3416 |
basicWithoutRedrawInsertLines:lines from:start to:end before:lineNr |
3417 |
super basicWithoutRedrawInsertLines:lines from:start to:end before:lineNr. |
|
3418 |
self updateReallyModified. |
|
3419 |
! |
|
3420 |
||
3421 |
basicWithoutRedrawInsertStringWithoutCRs:aString atLine:lineNr col:colNr |
|
3422 |
super basicWithoutRedrawInsertStringWithoutCRs:aString atLine:lineNr col:colNr. |
|
3423 |
self updateReallyModified. |
|
3424 |
! |
|
3425 |
||
| 10977 | 3426 |
insertLines:someText from:start to:end before:lineNr |
3427 |
||
3428 |
"/JV@2011-12-20: HACK, the super implementation should |
|
3429 |
"/not use leftIndent...when pasting. Following is a workaround" |
|
3430 |
| wasAutoIndent | |
|
3431 |
||
3432 |
wasAutoIndent := autoIndent. |
|
3433 |
autoIndent := false. |
|
| 12787 | 3434 |
[ |
3435 |
super insertLines:someText from:start to:end before:lineNr. |
|
3436 |
] ensure:[ |
|
3437 |
autoIndent := wasAutoIndent |
|
3438 |
] |
|
| 10977 | 3439 |
|
3440 |
"Created: / 20-12-2011 / 15:32:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 9985 | 3441 |
! ! |
3442 |
||
3443 |
!CodeView2::TextView methodsFor:'event handling'! |
|
3444 |
||
3445 |
buttonMotion:button x:x y:y |
|
3446 |
||
3447 |
(codeView buttonMotion:button x:x y:y in: self) |
|
3448 |
ifFalse:[super buttonMotion:button x:x y:y]. |
|
3449 |
||
3450 |
"Created: / 14-02-2010 / 16:23:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3451 |
"Modified: / 06-03-2010 / 20:10:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3452 |
! |
|
3453 |
||
3454 |
buttonPress: button x: x y: y |
|
3455 |
| ctrlDown | |
|
3456 |
||
3457 |
(codeView buttonPress:button x:x y:y in: self) |
|
| 12870 | 3458 |
ifFalse:[super buttonPress:button x:x y:y]. |
| 9985 | 3459 |
" |
3460 |
((ctrlDown := self sensor ctrlDown) and: [ codeView syntaxElementSelection notNil]) |
|
3461 |
ifTrue: [codeView buttonPressInTextView: button x:x y:y ctrlDown: ctrlDown]. |
|
3462 |
super |
|
3463 |
buttonPress: button |
|
3464 |
x: x |
|
3465 |
y: y |
|
3466 |
" |
|
3467 |
||
3468 |
"Created: / 14-02-2010 / 18:12:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3469 |
"Modified: / 06-03-2010 / 20:37:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3470 |
! |
|
3471 |
||
| 12868 | 3472 |
buttonRelease: button x: x y: y |
3473 |
(codeView buttonRelease:button x:x y:y in: self) |
|
| 12870 | 3474 |
ifFalse:[super buttonRelease:button x:x y:y]. |
| 12868 | 3475 |
! |
3476 |
||
| 9985 | 3477 |
exposeX:x y:y width:w height:h |
3478 |
super |
|
3479 |
exposeX:x |
|
3480 |
y:y |
|
3481 |
width:w |
|
3482 |
height:h. |
|
| 13374 | 3483 |
|
3484 |
"/ if in diffmode... |
|
| 9985 | 3485 |
self redrawLines. |
3486 |
||
3487 |
"Created: / 05-04-2010 / 10:07:50 / Jakub <zelenja7@fel.cvut.cz>" |
|
3488 |
"Modified: / 02-05-2010 / 18:41:07 / Jakub <zelenja7@fel.cvut.cz>" |
|
3489 |
! |
|
3490 |
||
3491 |
keyPress:key x:x y:y |
|
3492 |
(codeView keyPress:key x:x y:y in: self) |
|
3493 |
ifFalse:[super keyPress:key x:x y:y]. |
|
3494 |
||
3495 |
"Modified: / 06-03-2010 / 20:34:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3496 |
"Modified: / 05-04-2010 / 09:55:52 / Jakub <zelenja7@fel.cvut.cz>" |
|
3497 |
! |
|
3498 |
||
3499 |
keyRelease: key x: x y: y |
|
3500 |
||
3501 |
(codeView keyRelease:key x:x y:y in: self) |
|
3502 |
ifFalse:[super keyRelease:key x:x y:y]. |
|
3503 |
" |
|
3504 |
(key = #Control_L) ifTrue: |
|
3505 |
[ codeView highlightClear. self redraw ]. |
|
3506 |
||
3507 |
^ super |
|
3508 |
keyRelease: key |
|
3509 |
x: x |
|
3510 |
y: y |
|
3511 |
" |
|
3512 |
||
3513 |
"Created: / 14-02-2010 / 16:38:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3514 |
"Modified: / 06-03-2010 / 21:04:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3515 |
! ! |
|
3516 |
||
|
10970
dc9da0fc38ef
Small improvement for auto-indent (when enabled, not by default)
vrany
parents:
10967
diff
changeset
|
3517 |
!CodeView2::TextView methodsFor:'formatting'! |
|
dc9da0fc38ef
Small improvement for auto-indent (when enabled, not by default)
vrany
parents:
10967
diff
changeset
|
3518 |
|
|
dc9da0fc38ef
Small improvement for auto-indent (when enabled, not by default)
vrany
parents:
10967
diff
changeset
|
3519 |
leftIndentForLine:lineNr |
|
dc9da0fc38ef
Small improvement for auto-indent (when enabled, not by default)
vrany
parents:
10967
diff
changeset
|
3520 |
|
|
dc9da0fc38ef
Small improvement for auto-indent (when enabled, not by default)
vrany
parents:
10967
diff
changeset
|
3521 |
| lang | |
|
dc9da0fc38ef
Small improvement for auto-indent (when enabled, not by default)
vrany
parents:
10967
diff
changeset
|
3522 |
lang := codeView language. |
|
10973
44ccdbc1fb0a
fix in #leftIndentForLine: for view with nil language
vrany
parents:
10972
diff
changeset
|
3523 |
"Bit hacky here, should ask language some language toolbox |
|
44ccdbc1fb0a
fix in #leftIndentForLine: for view with nil language
vrany
parents:
10972
diff
changeset
|
3524 |
for formatting helper, that should do it..." |
|
44ccdbc1fb0a
fix in #leftIndentForLine: for view with nil language
vrany
parents:
10972
diff
changeset
|
3525 |
(lang notNil and:[lang isSmalltalk]) ifTrue:[ |
| 13942 | 3526 |
| line lineNo indent | |
3527 |
lineNo := lineNr. |
|
3528 |
[lineNo ~~ 1] whileTrue:[ |
|
3529 |
lineNo := lineNo - 1. |
|
3530 |
line := self listAt:lineNo. |
|
3531 |
||
3532 |
line notNil ifTrue:[ |
|
3533 |
indent := line indexOfNonSeparatorStartingAt:1. |
|
3534 |
"beggining od block" |
|
3535 |
line notEmptyOrNil ifTrue:[ |
|
3536 |
line last == $[ ifTrue:[ |
|
3537 |
indent := indent + 4. |
|
3538 |
] ifFalse:[ |
|
3539 |
"end of block args" |
|
3540 |
(line last == $| and: [line includes: $[]) ifTrue:[ |
|
3541 |
indent := indent + 4. |
|
3542 |
] |
|
3543 |
]. |
|
3544 |
]. |
|
3545 |
indent ~~ 0 ifTrue:[ |
|
3546 |
^ indent - 1 |
|
3547 |
] |
|
3548 |
] |
|
3549 |
]. |
|
3550 |
^0. |
|
|
10970
dc9da0fc38ef
Small improvement for auto-indent (when enabled, not by default)
vrany
parents:
10967
diff
changeset
|
3551 |
]. |
|
dc9da0fc38ef
Small improvement for auto-indent (when enabled, not by default)
vrany
parents:
10967
diff
changeset
|
3552 |
^super leftIndentForLine:lineNr |
|
dc9da0fc38ef
Small improvement for auto-indent (when enabled, not by default)
vrany
parents:
10967
diff
changeset
|
3553 |
|
|
dc9da0fc38ef
Small improvement for auto-indent (when enabled, not by default)
vrany
parents:
10967
diff
changeset
|
3554 |
"Created: / 10-12-2011 / 11:02:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
dc9da0fc38ef
Small improvement for auto-indent (when enabled, not by default)
vrany
parents:
10967
diff
changeset
|
3555 |
! ! |
|
dc9da0fc38ef
Small improvement for auto-indent (when enabled, not by default)
vrany
parents:
10967
diff
changeset
|
3556 |
|
| 9985 | 3557 |
!CodeView2::TextView methodsFor:'initialization'! |
3558 |
||
3559 |
initialize |
|
3560 |
||
3561 |
super initialize. |
|
3562 |
||
3563 |
changedDiffText := true. |
|
3564 |
diffMode := false. |
|
| 10224 | 3565 |
suppressNotifications := false. |
| 10781 | 3566 |
reallyModifiedChannel := false asValue. |
| 13813 | 3567 |
autoIndent := UserPreferences current codeView2AutoIndent. |
| 13942 | 3568 |
scrollInProgress := false. |
| 9985 | 3569 |
|
|
10630
d59bc761de55
fixed: #sendersMenu:selector:
Claus Gittinger <cg@exept.de>
parents:
10577
diff
changeset
|
3570 |
self enableMotionEvents. |
|
d59bc761de55
fixed: #sendersMenu:selector:
Claus Gittinger <cg@exept.de>
parents:
10577
diff
changeset
|
3571 |
|
| 9985 | 3572 |
"Created: / 23-06-2010 / 17:28:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10224 | 3573 |
"Modified: / 06-07-2011 / 17:46:31 / jv" |
|
10630
d59bc761de55
fixed: #sendersMenu:selector:
Claus Gittinger <cg@exept.de>
parents:
10577
diff
changeset
|
3574 |
"Modified: / 21-08-2011 / 10:09:29 / cg" |
| 13942 | 3575 |
"Modified: / 14-02-2014 / 10:31:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 3576 |
! |
3577 |
||
3578 |
setCodeView: aCodeView2 |
|
3579 |
||
3580 |
codeView := aCodeView2. |
|
3581 |
codeView addDependent: self. |
|
3582 |
gutterView := aCodeView2 gutterView. |
|
3583 |
||
3584 |
"Created: / 14-02-2010 / 15:22:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3585 |
"Modified: / 17-06-2011 / 12:43:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3586 |
! |
|
3587 |
||
3588 |
setGutterView: aGutterView |
|
3589 |
||
3590 |
self assert: gutterView isNil message:'Attempting to set gutterView twice'. |
|
3591 |
gutterView := aGutterView. |
|
3592 |
gutterView setTextView: self. |
|
3593 |
||
3594 |
"Created: / 02-09-2009 / 21:57:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3595 |
! ! |
|
3596 |
||
3597 |
!CodeView2::TextView methodsFor:'menu & menu actions'! |
|
3598 |
||
| 10781 | 3599 |
accept |
3600 |
||
3601 |
super accept. |
|
3602 |
reallyModifiedChannel value: false. |
|
| 10785 | 3603 |
listOriginal := list copy. |
| 10781 | 3604 |
|
3605 |
"Created: / 07-10-2011 / 19:36:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3606 |
! |
|
3607 |
||
| 10784 | 3608 |
cancel |
3609 |
||
| 10785 | 3610 |
self list: listOriginal |
| 10784 | 3611 |
|
3612 |
"Created: / 08-02-2010 / 09:29:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3613 |
! |
|
3614 |
||
| 9985 | 3615 |
editMenu |
3616 |
||
|
11398
84d3987c0155
better search (for variables)
Claus Gittinger <cg@exept.de>
parents:
11393
diff
changeset
|
3617 |
^ codeView editMenu |
| 9985 | 3618 |
|
3619 |
"Created: / 14-02-2010 / 15:49:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
|
11398
84d3987c0155
better search (for variables)
Claus Gittinger <cg@exept.de>
parents:
11393
diff
changeset
|
3620 |
"Modified (format): / 08-03-2012 / 12:30:22 / cg" |
|
84d3987c0155
better search (for variables)
Claus Gittinger <cg@exept.de>
parents:
11393
diff
changeset
|
3621 |
! |
|
84d3987c0155
better search (for variables)
Claus Gittinger <cg@exept.de>
parents:
11393
diff
changeset
|
3622 |
|
|
84d3987c0155
better search (for variables)
Claus Gittinger <cg@exept.de>
parents:
11393
diff
changeset
|
3623 |
searchVariableVisible |
|
84d3987c0155
better search (for variables)
Claus Gittinger <cg@exept.de>
parents:
11393
diff
changeset
|
3624 |
"search variable option in searchbox visible?" |
|
84d3987c0155
better search (for variables)
Claus Gittinger <cg@exept.de>
parents:
11393
diff
changeset
|
3625 |
|
|
84d3987c0155
better search (for variables)
Claus Gittinger <cg@exept.de>
parents:
11393
diff
changeset
|
3626 |
^ true |
|
84d3987c0155
better search (for variables)
Claus Gittinger <cg@exept.de>
parents:
11393
diff
changeset
|
3627 |
|
|
84d3987c0155
better search (for variables)
Claus Gittinger <cg@exept.de>
parents:
11393
diff
changeset
|
3628 |
"Created: / 08-03-2012 / 14:01:51 / cg" |
| 9985 | 3629 |
! ! |
3630 |
||
3631 |
!CodeView2::TextView methodsFor:'notification'! |
|
3632 |
||
3633 |
notifyLinesDeletedFrom: startLine to: endLine |
|
3634 |
||
| 10781 | 3635 |
self updateReallyModified. |
| 10224 | 3636 |
suppressNotifications ifTrue:[^self]. |
3637 |
codeView linesDeletedFrom: startLine to: endLine. |
|
3638 |
suppressNotifications := true. |
|
3639 |
||
| 9985 | 3640 |
"Created: / 28-06-2011 / 09:12:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10224 | 3641 |
"Modified: / 06-07-2011 / 17:47:05 / jv" |
| 10781 | 3642 |
"Modified: / 07-10-2011 / 19:20:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 3643 |
! |
3644 |
||
3645 |
notifyLinesInsertedFrom: startLine to: endLine |
|
3646 |
||
| 10781 | 3647 |
self updateReallyModified. |
| 10224 | 3648 |
suppressNotifications ifTrue:[^self]. |
3649 |
codeView linesInsertedFrom: startLine to: endLine. |
|
3650 |
suppressNotifications := true. |
|
3651 |
||
| 9985 | 3652 |
"Created: / 28-06-2011 / 09:12:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10224 | 3653 |
"Modified: / 06-07-2011 / 17:47:20 / jv" |
| 10781 | 3654 |
"Modified: / 07-10-2011 / 19:20:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10708
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3655 |
! |
|
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3656 |
|
|
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3657 |
notifyLinesModifiedFrom: startLine to: endLine |
|
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3658 |
|
| 10781 | 3659 |
self updateReallyModified. |
|
10708
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3660 |
suppressNotifications ifTrue:[^self]. |
|
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3661 |
codeView linesModifiedFrom: startLine to: endLine. |
|
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3662 |
suppressNotifications := true. |
|
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3663 |
|
|
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3664 |
"Modified: / 06-07-2011 / 17:47:20 / jv" |
|
dd79e944752e
Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents:
10689
diff
changeset
|
3665 |
"Created: / 16-09-2011 / 15:12:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 3666 |
! ! |
3667 |
||
3668 |
!CodeView2::TextView methodsFor:'private'! |
|
3669 |
||
| 14503 | 3670 |
isTextDifferentFromOriginalSource |
| 10781 | 3671 |
"check for modified code by comparing the source against |
3672 |
the codeViews contents. |
|
| 14503 | 3673 |
That's the true modified value |
3674 |
(in case user undid his changes, and the displayed text is actually original)" |
|
3675 |
||
3676 |
|different changedSource originalSource |
|
3677 |
lastLineOfChangedSource lastLineOfOriginalSource |
|
3678 |
originalL changedL checkIfDifferent| |
|
3679 |
||
3680 |
"/ possibly call at higher prio to prevent it from being changed while we convert it (by editing) |
|
3681 |
||
3682 |
different := false. |
|
3683 |
||
3684 |
"/ cg: don't do that (collecting original/changedSource); |
|
3685 |
"/ for huge files (>8Mb), this makes editing annoying slow (editing a trace output, for example) |
|
| 12347 | 3686 |
"/ changedSource := list ? #(). |
3687 |
"/ changedSource := changedSource collect:[:line | line isEmptyOrNil ifTrue:[nil] ifFalse:[line]]. |
|
3688 |
"/ [changedSource size > 0 and:[changedSource last isNil]] whileTrue:[ |
|
3689 |
"/ changedSource := changedSource removeLast. |
|
3690 |
"/ ]. |
|
3691 |
"/ |
|
3692 |
"/ originalSource := listOriginal ? #() "self model value ? ''". |
|
3693 |
"/ originalSource := originalSource collect:[:line | line isEmptyOrNil ifTrue:[nil] ifFalse:[line]]. |
|
3694 |
"/ [originalSource size > 0 and:[originalSource last isNil]] whileTrue:[ |
|
3695 |
"/ originalSource := originalSource removeLast |
|
3696 |
"/ ]. |
|
3697 |
"/ originalSource size ~~ changedSource size ifTrue:[ |
|
3698 |
"/ modified := true. |
|
3699 |
"/ ] ifFalse:[ |
|
3700 |
"/ | i stopIndex | |
|
3701 |
"/ |
|
3702 |
"/ i := 1. |
|
3703 |
"/ stopIndex := originalSource size + 1. |
|
3704 |
"/ [ modified not and:[ i < stopIndex ] ] whileTrue:[ |
|
3705 |
"/ | originalL changedL | |
|
3706 |
"/ |
|
3707 |
"/ originalL := ((originalSource at: i) ? '') string. |
|
3708 |
"/ changedL := ((changedSource at: i) ? '') string. |
|
3709 |
"/ originalL ~= changedL ifTrue:[ |
|
3710 |
"/ originalL withoutTrailingSeparators ~= changedL withoutTrailingSeparators ifTrue:[ |
|
3711 |
"/ modified := true. |
|
3712 |
"/ ] |
|
3713 |
"/ ]. |
|
3714 |
"/ i := i + 1. |
|
3715 |
"/ ] |
|
3716 |
"/ ]. |
|
| 14503 | 3717 |
|
3718 |
list size ~~ listOriginal size ifTrue:[ |
|
3719 |
^ true |
|
3720 |
]. |
|
3721 |
||
3722 |
"/ instead, do everything without collecting a new stringcollection. |
|
3723 |
changedSource := list ? #(). |
|
3724 |
lastLineOfChangedSource := changedSource size. |
|
3725 |
[lastLineOfChangedSource > 0 and:[(changedSource at:lastLineOfChangedSource) isEmptyOrNil]] whileTrue:[ |
|
3726 |
lastLineOfChangedSource := lastLineOfChangedSource - 1. |
|
3727 |
]. |
|
3728 |
originalSource := listOriginal ? #(). |
|
3729 |
lastLineOfOriginalSource := originalSource size. |
|
3730 |
[lastLineOfOriginalSource > 0 and:[(originalSource at:lastLineOfOriginalSource) isEmptyOrNil]] whileTrue:[ |
|
3731 |
lastLineOfOriginalSource := lastLineOfOriginalSource - 1. |
|
3732 |
]. |
|
3733 |
||
3734 |
lastLineOfOriginalSource ~~ lastLineOfChangedSource ifTrue:[ |
|
3735 |
^ true. |
|
3736 |
]. |
|
3737 |
||
3738 |
checkIfDifferent := |
|
3739 |
[:lNr | |
|
| 14504 | 3740 |
lNr > originalSource size ifTrue:[ |
3741 |
originalL := ''. |
|
3742 |
] ifFalse:[ |
|
3743 |
originalL := ((originalSource at: lNr) ? '') string. |
|
3744 |
]. |
|
| 14511 | 3745 |
lNr > changedSource size ifTrue:[ |
| 14504 | 3746 |
changedL := ''. |
3747 |
] ifFalse:[ |
|
| 14511 | 3748 |
changedL := ((changedSource at: lNr) ? '') string. |
| 14504 | 3749 |
]. |
| 14503 | 3750 |
originalL ~= changedL ifTrue:[ |
3751 |
originalL withoutTrailingSeparators ~= changedL withoutTrailingSeparators ifTrue:[ |
|
3752 |
^ true. |
|
3753 |
] |
|
3754 |
]. |
|
| 12347 | 3755 |
]. |
3756 |
||
| 14503 | 3757 |
"/ do a quick check in the cursor line. This is most likely to be different |
3758 |
"/ saves comparing all the rest in 99% of cases (while typing) |
|
3759 |
cursorLine notNil ifTrue:[ |
|
3760 |
checkIfDifferent value:cursorLine. |
|
| 10781 | 3761 |
]. |
3762 |
||
| 14503 | 3763 |
1 to:lastLineOfOriginalSource do:checkIfDifferent. |
3764 |
^ false |
|
3765 |
! |
|
3766 |
||
3767 |
superEditMenu |
|
3768 |
||
3769 |
^super editMenu |
|
3770 |
||
3771 |
"Created: / 14-02-2010 / 15:48:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3772 |
! |
|
3773 |
||
3774 |
updateReallyModified |
|
3775 |
"check for modified code by comparing the source against |
|
3776 |
the codeViews contents. |
|
3777 |
Thats the true modified value (in case user undid its changes, |
|
3778 |
and the displayed text is actually original" |
|
3779 |
||
3780 |
|modified| |
|
3781 |
||
3782 |
reallyModifiedChannel isNil ifTrue:[^self]. |
|
3783 |
"JV@2011-10-27: Idea is not to do anything if nobody is |
|
3784 |
interested. Not sure if it is a good idea, thought." |
|
3785 |
reallyModifiedChannel dependents isEmptyOrNil ifTrue:[^self]. |
|
3786 |
||
3787 |
"/ higher prio to prevent it from being changed while we convert it (by editing) |
|
3788 |
||
3789 |
modified := self isTextDifferentFromOriginalSource. |
|
3790 |
||
| 10781 | 3791 |
reallyModifiedChannel value: modified |
3792 |
||
3793 |
"Created: / 07-10-2011 / 19:16:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10783 | 3794 |
"Modified: / 08-10-2011 / 11:10:01 / cg" |
|
10844
cbb5f5dd900a
Performance fix in CodeView2::TextView>>updateReallyModified
vrany
parents:
10834
diff
changeset
|
3795 |
"Modified: / 28-10-2011 / 09:23:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 9985 | 3796 |
! ! |
3797 |
||
|
11903
5b027fc44ff8
+supportsSyntaxElements query
Claus Gittinger <cg@exept.de>
parents:
11769
diff
changeset
|
3798 |
!CodeView2::TextView methodsFor:'queries'! |
|
5b027fc44ff8
+supportsSyntaxElements query
Claus Gittinger <cg@exept.de>
parents:
11769
diff
changeset
|
3799 |
|
| 13625 | 3800 |
editedClass |
3801 |
|cls| |
|
3802 |
||
3803 |
(cls := codeView classHolder value) notNil ifTrue:[ |
|
3804 |
^ cls |
|
3805 |
]. |
|
3806 |
^ super editedClass |
|
3807 |
! |
|
3808 |
||
3809 |
editedMethod |
|
3810 |
|cls| |
|
3811 |
||
3812 |
(cls := codeView methodHolder value) notNil ifTrue:[ |
|
3813 |
^ cls |
|
3814 |
]. |
|
3815 |
^ super editedMethod |
|
3816 |
! |
|
3817 |
||
|
11903
5b027fc44ff8
+supportsSyntaxElements query
Claus Gittinger <cg@exept.de>
parents:
11769
diff
changeset
|
3818 |
supportsSyntaxElements |
| 14506 | 3819 |
"syntax elements are a byproduct of the syntax highlighter; |
3820 |
it is a list of elements, which chain together same-named variables |
|
3821 |
and parts of a keyword message's selector. |
|
3822 |
These allow for quick forward/backward navigation to the next/prev. occurrence |
|
3823 |
of a variable. Be aware that the implementation is buggy, in that it does not |
|
3824 |
deal correctly with same-named blockvars of different blocks" |
|
3825 |
||
|
11903
5b027fc44ff8
+supportsSyntaxElements query
Claus Gittinger <cg@exept.de>
parents:
11769
diff
changeset
|
3826 |
^ true |
| 12980 | 3827 |
! |
3828 |
||
3829 |
syntaxElementAtPosition:position |
|
3830 |
"is there is a syntax element at position? |
|
3831 |
If so, return the element; otherwise, return nil" |
|
3832 |
||
| 14506 | 3833 |
|syntaxElements el| |
| 12980 | 3834 |
|
3835 |
syntaxElements := codeView syntaxElements. |
|
3836 |
syntaxElements isEmptyOrNil ifTrue:[^ nil]. |
|
3837 |
el := syntaxElements detect:[:el | position between:el start and:el stop] ifNone:nil. |
|
3838 |
el isNil ifTrue:[^ nil]. |
|
3839 |
^ el. |
|
3840 |
||
3841 |
"Created: / 08-03-2012 / 14:21:52 / cg" |
|
3842 |
! |
|
3843 |
||
3844 |
syntaxElementForSelectedVariable |
|
3845 |
"is there is a syntax element for a variable under the cursor? |
|
3846 |
If so, return the element; otherwise, return nil" |
|
3847 |
||
3848 |
|element startPosition endPosition| |
|
3849 |
||
| 14506 | 3850 |
self selectionAsString isEmptyOrNil ifTrue:[ |
3851 |
"/ ^ nil. |
|
3852 |
element := self syntaxElementForVariableUnderCursor. |
|
3853 |
] ifFalse:[ |
|
3854 |
startPosition := self characterPositionOfLine:selectionStartLine col:selectionStartCol. |
|
3855 |
endPosition := self characterPositionOfLine:selectionEndLine col:selectionEndCol. |
|
3856 |
element := self syntaxElementAtPosition:startPosition. |
|
3857 |
]. |
|
| 12980 | 3858 |
element isNil ifTrue:[^ nil]. |
3859 |
(element start = startPosition and:[element stop = endPosition]) ifFalse:[^ nil]. |
|
3860 |
||
3861 |
element isNil ifTrue:[^ nil]. |
|
3862 |
element isVariableOrSelf ifFalse:[^ nil]. |
|
3863 |
^ element |
|
3864 |
||
3865 |
"Created: / 08-03-2012 / 14:21:15 / cg" |
|
3866 |
! |
|
3867 |
||
3868 |
syntaxElementForSelectorUnderCursor |
|
3869 |
"is there is a syntax element for a message selector under the cursor? |
|
3870 |
If so, return the element; otherwise, return nil" |
|
3871 |
||
3872 |
|elementUnderCursor | |
|
3873 |
||
| 14506 | 3874 |
elementUnderCursor := self syntaxElementUnderCursor. |
| 12980 | 3875 |
elementUnderCursor isNil ifTrue:[^ nil]. |
3876 |
elementUnderCursor isSelector ifFalse:[^ nil]. |
|
3877 |
^ elementUnderCursor. |
|
3878 |
||
3879 |
"Created: / 08-03-2012 / 12:44:03 / cg" |
|
3880 |
! |
|
3881 |
||
3882 |
syntaxElementForVariableUnderCursor |
|
3883 |
"is there is a syntax element for a variable under the cursor? |
|
3884 |
If so, return the element; otherwise, return nil" |
|
3885 |
||
3886 |
|elementUnderCursor | |
|
3887 |
||
| 14506 | 3888 |
elementUnderCursor := self syntaxElementUnderCursor. |
| 12980 | 3889 |
elementUnderCursor isNil ifTrue:[^ nil]. |
3890 |
elementUnderCursor isVariableOrSelf ifFalse:[^ nil]. |
|
3891 |
^ elementUnderCursor. |
|
3892 |
||
3893 |
"Created: / 08-03-2012 / 12:44:03 / cg" |
|
| 14506 | 3894 |
! |
3895 |
||
3896 |
syntaxElementUnderCursor |
|
3897 |
"is there is a syntax element under the cursor? |
|
3898 |
If so, return the element; otherwise, return nil" |
|
3899 |
||
3900 |
^ self syntaxElementAtPosition:(self characterPositionOfCursor). |
|
|
11903
5b027fc44ff8
+supportsSyntaxElements query
Claus Gittinger <cg@exept.de>
parents:
11769
diff
changeset
|
3901 |
! ! |
|
5b027fc44ff8
+supportsSyntaxElements query
Claus Gittinger <cg@exept.de>
parents:
11769
diff
changeset
|
3902 |
|
| 9985 | 3903 |
!CodeView2::TextView methodsFor:'scrolling'! |
3904 |
||
| 13813 | 3905 |
basicScrollTo:anOrigin redraw:doRedraw |
| 13942 | 3906 |
| savedScrollIProgress | |
3907 |
||
3908 |
savedScrollIProgress := scrollInProgress. |
|
3909 |
scrollInProgress := true. |
|
3910 |
[ |
|
3911 |
super scrollTo:anOrigin redraw:doRedraw |
|
3912 |
] ensure:[ |
|
3913 |
scrollInProgress := savedScrollIProgress. |
|
3914 |
]. |
|
3915 |
"Modified: / 14-02-2014 / 10:12:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 13813 | 3916 |
! |
3917 |
||
| 9985 | 3918 |
originChanged:delta |
3919 |
||
3920 |
super originChanged:delta. |
|
3921 |
||
| 13105 | 3922 |
"/ gutterView invalidate. |
| 9985 | 3923 |
|
3924 |
"Created: / 07-12-2009 / 21:50:49 / Jindra <a>" |
|
3925 |
! |
|
3926 |
||
| 13813 | 3927 |
scrollTo:anOrigin redraw:doRedraw |
3928 |
||
3929 |
codeView scrollTo:anOrigin redraw:doRedraw in: self. |
|
3930 |
self basicScrollTo:anOrigin redraw:doRedraw |
|
3931 |
||
3932 |
"Modified: / 06-04-2010 / 14:04:28 / Jakub <zelenja7@fel.cvut.cz>" |
|
3933 |
"Modified: / 17-03-2012 / 10:06:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3934 |
"Created: / 19-03-2012 / 17:05:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 9985 | 3935 |
! ! |
3936 |
||
| 10224 | 3937 |
!CodeView2::TextView methodsFor:'undo & again'! |
3938 |
||
3939 |
nonUndoableDo: aBlock |
|
3940 |
||
3941 |
super nonUndoableDo: aBlock. |
|
3942 |
suppressNotifications := false. |
|
3943 |
||
3944 |
"Created: / 06-07-2011 / 17:48:27 / jv" |
|
3945 |
! |
|
3946 |
||
3947 |
undoableDo: aBlock info: into |
|
3948 |
||
3949 |
super undoableDo: aBlock info: into. |
|
3950 |
suppressNotifications := false. |
|
3951 |
||
3952 |
"Created: / 06-07-2011 / 17:48:49 / jv" |
|
3953 |
! ! |
|
3954 |
||
| 9985 | 3955 |
!CodeView2 class methodsFor:'documentation'! |
3956 |
||
| 10293 | 3957 |
version |
| 14520 | 3958 |
^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.157 2014-06-17 11:39:03 cg Exp $' |
| 10293 | 3959 |
! |
3960 |
||
| 9985 | 3961 |
version_CVS |
| 14520 | 3962 |
^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.157 2014-06-17 11:39:03 cg Exp $' |
| 9985 | 3963 |
! |
3964 |
||
3965 |
version_SVN |
|
| 14520 | 3966 |
^ '$Id: Tools__CodeView2.st,v 1.157 2014-06-17 11:39:03 cg Exp $' |
| 9985 | 3967 |
! ! |
3968 |
||
| 12347 | 3969 |
|
| 9985 | 3970 |
CodeView2 initialize! |