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