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