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