author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Thu, 26 Oct 2017 12:35:22 +0000 | |
changeset 1059 | acfcb242f75e |
parent 458 | de41bf2025c0 |
child 1072 | a44c741ee5ef |
permissions | -rw-r--r-- |
252
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
1 |
" |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
2 |
stx:goodies/smallsense - A productivity plugin for Smalltalk/X IDE |
374
e65bd2bf892a
Updated copyright notice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
274
diff
changeset
|
3 |
Copyright (C) 2013-2015 Jan Vrany |
252
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
4 |
|
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
5 |
This library is free software; you can redistribute it and/or |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
6 |
modify it under the terms of the GNU Lesser General Public |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
7 |
License as published by the Free Software Foundation; either |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
8 |
version 2.1 of the License. |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
9 |
|
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
10 |
This library is distributed in the hope that it will be useful, |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
11 |
but WITHOUT ANY WARRANTY; without even the implied warranty of |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
12 |
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
13 |
Lesser General Public License for more details. |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
14 |
|
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
15 |
You should have received a copy of the GNU Lesser General Public |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
16 |
License along with this library; if not, write to the Free Software |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
17 |
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
18 |
" |
249
8bc64027b189
Package renamed to stx:goodies/smallsense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
239
diff
changeset
|
19 |
"{ Package: 'stx:goodies/smallsense' }" |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
20 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
21 |
"{ NameSpace: SmallSense }" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
22 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
23 |
Object subclass:#EditSupport |
395
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
24 |
instanceVariableNames:'textView backspaceIsUndo completionController |
205
43bee6463c53
Introduced notion of `environment` to completion context.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
186
diff
changeset
|
25 |
completionEnvironment snippets ignoreKeystrokes |
446
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
26 |
ignoreKeystrokesPosition ignoreKeystrokesStartLine |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
27 |
ignoreKeystrokesStartCol electricInsertSuppressed' |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
28 |
classVariableNames:'' |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
29 |
poolDictionaries:'' |
67
020b7461b15e
Package structure reorganization.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
64
diff
changeset
|
30 |
category:'SmallSense-Core-Services' |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
31 |
! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
32 |
|
252
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
33 |
!EditSupport class methodsFor:'documentation'! |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
34 |
|
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
35 |
copyright |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
36 |
" |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
37 |
stx:goodies/smallsense - A productivity plugin for Smalltalk/X IDE |
374
e65bd2bf892a
Updated copyright notice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
274
diff
changeset
|
38 |
Copyright (C) 2013-2015 Jan Vrany |
252
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
39 |
|
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
40 |
This library is free software; you can redistribute it and/or |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
41 |
modify it under the terms of the GNU Lesser General Public |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
42 |
License as published by the Free Software Foundation; either |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
43 |
version 2.1 of the License. |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
44 |
|
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
45 |
This library is distributed in the hope that it will be useful, |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
46 |
but WITHOUT ANY WARRANTY; without even the implied warranty of |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
47 |
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
48 |
Lesser General Public License for more details. |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
49 |
|
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
50 |
You should have received a copy of the GNU Lesser General Public |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
51 |
License along with this library; if not, write to the Free Software |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
52 |
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
53 |
" |
feba6ee5c814
Added copyright notice and license information (LGPL2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
249
diff
changeset
|
54 |
! ! |
112
5c8f0eb0dd55
UX fixes for completion: do not close the completionwindow then pressing Ctrl-space
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
110
diff
changeset
|
55 |
|
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
56 |
!EditSupport class methodsFor:'instance creation'! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
57 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
58 |
forLanguage: aProgrammingLanguage |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
59 |
aProgrammingLanguage notNil ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
60 |
aProgrammingLanguage isSmalltalk ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
61 |
^ SmalltalkEditSupport new |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
62 |
]. |
122 | 63 |
(aProgrammingLanguage askFor: #isJava) ifTrue:[ |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
64 |
^ JavaEditSupport new |
122 | 65 |
]. |
66 |
(aProgrammingLanguage askFor: #isGroovy) ifTrue:[ |
|
67 |
^ GroovyEditSupport new |
|
68 |
] |
|
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
69 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
70 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
71 |
^GenericEditSupport new. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
72 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
73 |
"Created: / 24-07-2013 / 23:20:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
122 | 74 |
"Modified: / 04-10-2013 / 08:41:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
75 |
! ! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
76 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
77 |
!EditSupport methodsFor:'accessing'! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
78 |
|
445
783f2a4af9c2
Electric insert: do not insert again and again when insertion was deleted by pressing backspace
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
79 |
electricInsertSuppressed |
783f2a4af9c2
Electric insert: do not insert again and again when insertion was deleted by pressing backspace
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
80 |
^ electricInsertSuppressed |
783f2a4af9c2
Electric insert: do not insert again and again when insertion was deleted by pressing backspace
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
81 |
! |
783f2a4af9c2
Electric insert: do not insert again and again when insertion was deleted by pressing backspace
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
82 |
|
213
360f02a38ae9
Use EditSupport>>environment to allow environment customization.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
205
diff
changeset
|
83 |
environment |
395
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
84 |
^ completionEnvironment ? Smalltalk |
213
360f02a38ae9
Use EditSupport>>environment to allow environment customization.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
205
diff
changeset
|
85 |
|
360f02a38ae9
Use EditSupport>>environment to allow environment customization.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
205
diff
changeset
|
86 |
"Created: / 15-05-2014 / 16:44:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
395
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
87 |
"Modified: / 11-02-2015 / 23:58:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
213
360f02a38ae9
Use EditSupport>>environment to allow environment customization.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
205
diff
changeset
|
88 |
! |
360f02a38ae9
Use EditSupport>>environment to allow environment customization.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
205
diff
changeset
|
89 |
|
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
90 |
language |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
91 |
^ self subclassResponsibility. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
92 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
93 |
"Created: / 24-07-2013 / 23:44:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
94 |
! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
95 |
|
164
3c5e63dbdb3b
Fixes for Groovy completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
159
diff
changeset
|
96 |
textView |
3c5e63dbdb3b
Fixes for Groovy completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
159
diff
changeset
|
97 |
^ textView |
3c5e63dbdb3b
Fixes for Groovy completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
159
diff
changeset
|
98 |
|
3c5e63dbdb3b
Fixes for Groovy completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
159
diff
changeset
|
99 |
"Created: / 03-02-2014 / 23:28:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
100 |
! ! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
101 |
|
120
4fefce92f5bb
Initial support for Java/Groovy completion and for mixed-language completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
102 |
!EditSupport methodsFor:'accessing-classes'! |
4fefce92f5bb
Initial support for Java/Groovy completion and for mixed-language completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
103 |
|
205
43bee6463c53
Introduced notion of `environment` to completion context.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
186
diff
changeset
|
104 |
completionControllerClass |
43bee6463c53
Introduced notion of `environment` to completion context.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
186
diff
changeset
|
105 |
"raise an error: this method should be implemented (TODO)" |
43bee6463c53
Introduced notion of `environment` to completion context.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
186
diff
changeset
|
106 |
|
43bee6463c53
Introduced notion of `environment` to completion context.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
186
diff
changeset
|
107 |
^ CompletionController |
43bee6463c53
Introduced notion of `environment` to completion context.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
186
diff
changeset
|
108 |
|
43bee6463c53
Introduced notion of `environment` to completion context.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
186
diff
changeset
|
109 |
"Created: / 13-05-2014 / 16:13:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
43bee6463c53
Introduced notion of `environment` to completion context.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
186
diff
changeset
|
110 |
! |
43bee6463c53
Introduced notion of `environment` to completion context.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
186
diff
changeset
|
111 |
|
120
4fefce92f5bb
Initial support for Java/Groovy completion and for mixed-language completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
112 |
completionEngineClass |
4fefce92f5bb
Initial support for Java/Groovy completion and for mixed-language completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
113 |
"Returns a code completion engine class or nil, of |
4fefce92f5bb
Initial support for Java/Groovy completion and for mixed-language completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
114 |
no completion is supported" |
4fefce92f5bb
Initial support for Java/Groovy completion and for mixed-language completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
115 |
|
4fefce92f5bb
Initial support for Java/Groovy completion and for mixed-language completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
116 |
^ nil |
4fefce92f5bb
Initial support for Java/Groovy completion and for mixed-language completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
117 |
|
4fefce92f5bb
Initial support for Java/Groovy completion and for mixed-language completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
118 |
"Created: / 03-10-2013 / 17:43:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
134
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
119 |
! |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
120 |
|
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
121 |
scannerClass |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
122 |
"Returns a class to use for scanning lines. If nil, scanning is |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
123 |
not supported and scanLine* methods will return an empty array." |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
124 |
|
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
125 |
^ nil |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
126 |
|
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
127 |
"Created: / 22-10-2013 / 00:33:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
120
4fefce92f5bb
Initial support for Java/Groovy completion and for mixed-language completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
128 |
! ! |
4fefce92f5bb
Initial support for Java/Groovy completion and for mixed-language completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
129 |
|
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
130 |
!EditSupport methodsFor:'editing'! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
131 |
|
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
132 |
electricDeleteCharacterAtCol: col |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
133 |
textView deleteCharAtLine: textView cursorLine col: col |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
134 |
|
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
135 |
"Created: / 22-01-2014 / 21:17:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
136 |
! |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
137 |
|
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
138 |
electricDeleteCharacterAtLine:line col: col |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
139 |
textView deleteCharAtLine: line col: col |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
140 |
|
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
141 |
"Created: / 22-01-2014 / 21:16:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
142 |
! |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
143 |
|
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
144 |
electricDo:aBlock |
134
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
145 |
textView completionSupport notNil ifTrue:[ |
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
146 |
(textView completionSupport) |
134
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
147 |
stopCompletionProcess; |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
148 |
closeCompletionView. |
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
149 |
]. |
89
8ff5fb2b27bf
Improvement in (Smalltalk)EditSupport.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
150 |
textView hasSelection ifTrue:[ |
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
151 |
textView undoableDo:[ textView deleteSelection ]. |
89
8ff5fb2b27bf
Improvement in (Smalltalk)EditSupport.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
152 |
]. |
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
153 |
textView undoableDo:[ aBlock value. ]. |
89
8ff5fb2b27bf
Improvement in (Smalltalk)EditSupport.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
154 |
backspaceIsUndo := true. |
8ff5fb2b27bf
Improvement in (Smalltalk)EditSupport.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
155 |
|
8ff5fb2b27bf
Improvement in (Smalltalk)EditSupport.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
156 |
"Created: / 17-09-2013 / 23:15:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
134
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
157 |
"Modified: / 22-10-2013 / 03:15:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
89
8ff5fb2b27bf
Improvement in (Smalltalk)EditSupport.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
158 |
! |
8ff5fb2b27bf
Improvement in (Smalltalk)EditSupport.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
159 |
|
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
160 |
electricInsert:text |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
161 |
self electricInsert:text advanceCursorBy:nil. |
135
f40d2ac07f38
Electric editing for Smalltalk: autoinsert space fter assignment.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
134
diff
changeset
|
162 |
|
f40d2ac07f38
Electric editing for Smalltalk: autoinsert space fter assignment.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
134
diff
changeset
|
163 |
"Created: / 22-10-2013 / 11:08:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
f40d2ac07f38
Electric editing for Smalltalk: autoinsert space fter assignment.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
134
diff
changeset
|
164 |
! |
f40d2ac07f38
Electric editing for Smalltalk: autoinsert space fter assignment.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
134
diff
changeset
|
165 |
|
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
166 |
electricInsert:stringOrLines advanceCursorBy:offsetOrNil |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
167 |
^ self |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
168 |
electricInsert:stringOrLines |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
169 |
advanceCursorBy:offsetOrNil |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
170 |
ignoreKeystrokes:nil |
155
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
171 |
|
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
172 |
"Created: / 22-10-2013 / 11:56:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
173 |
"Modified: / 19-01-2014 / 20:29:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
174 |
! |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
175 |
|
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
176 |
electricInsert:stringOrLines advanceCursorBy:offsetOrNil ignoreKeystrokes:ignoreKeystrokeSequence |
144
a43236d0c411
Indentation fixes for electric-inserted code.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
139
diff
changeset
|
177 |
"Insert given stringOrLines. If offsetOrNil is not nil, then |
155
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
178 |
move cursor by `offsetOrNil` after the **begining** of |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
179 |
inserted text. If `ignoreKeystrokeSequence` is not nil and not empty, then if |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
180 |
subsequent key strokes are ignored (i.e, does nothing) if matches |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
181 |
the given sequence. This is used to avoid duplication if user is not |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
182 |
aware of electric insertion and types whole text that has been |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
183 |
(electrically) inserted). |
144
a43236d0c411
Indentation fixes for electric-inserted code.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
139
diff
changeset
|
184 |
|
a43236d0c411
Indentation fixes for electric-inserted code.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
139
diff
changeset
|
185 |
`stringOrLines` could be either string or collection of strings (lines) |
a43236d0c411
Indentation fixes for electric-inserted code.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
139
diff
changeset
|
186 |
`offsetOrNil` could be either integer (cursor is then advanced by |
a43236d0c411
Indentation fixes for electric-inserted code.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
139
diff
changeset
|
187 |
offsetOrNil characters after **begining** of inserted text) |
a43236d0c411
Indentation fixes for electric-inserted code.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
139
diff
changeset
|
188 |
or point (x,y, cursor is then advanced by x lines after current |
a43236d0c411
Indentation fixes for electric-inserted code.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
139
diff
changeset
|
189 |
line and by y characters after beggining of the inserted text |
a43236d0c411
Indentation fixes for electric-inserted code.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
139
diff
changeset
|
190 |
(if x == 0) or at set at column y (if x ~~ 0) |
155
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
191 |
`ignoreKeystrokeSequence` a sequenceable collection of keys (in a form |
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
192 |
as passed to #keyPress:x:y: method." |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
193 |
|
446
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
194 |
| lineOffset colOffset oldCursorLine oldCursorCol newCursorLine newCursorCol advanceCursor | |
144
a43236d0c411
Indentation fixes for electric-inserted code.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
139
diff
changeset
|
195 |
|
a43236d0c411
Indentation fixes for electric-inserted code.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
139
diff
changeset
|
196 |
advanceCursor := false. |
446
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
197 |
ignoreKeystrokeSequence notNil ifTrue:[ |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
198 |
oldCursorLine := textView cursorLine. |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
199 |
oldCursorCol := textView cursorCol. |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
200 |
]. |
144
a43236d0c411
Indentation fixes for electric-inserted code.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
139
diff
changeset
|
201 |
offsetOrNil notNil ifTrue:[ |
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
202 |
lineOffset := offsetOrNil isPoint ifTrue:[ |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
203 |
offsetOrNil x |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
204 |
] ifFalse:[ 0 ]. |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
205 |
colOffset := offsetOrNil isPoint ifTrue:[ |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
206 |
offsetOrNil y |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
207 |
] ifFalse:[ |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
208 |
offsetOrNil |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
209 |
]. |
144
a43236d0c411
Indentation fixes for electric-inserted code.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
139
diff
changeset
|
210 |
newCursorLine := textView cursorLine + lineOffset. |
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
211 |
newCursorCol := (lineOffset == 0 |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
212 |
ifTrue:[ textView cursorCol ] |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
213 |
ifFalse:[ 0 ]) + colOffset. |
144
a43236d0c411
Indentation fixes for electric-inserted code.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
139
diff
changeset
|
214 |
advanceCursor := true. |
a43236d0c411
Indentation fixes for electric-inserted code.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
139
diff
changeset
|
215 |
]. |
137
12232e62cf54
Fixes in electring snippets (both in API and Smalltalk snippets)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
135
diff
changeset
|
216 |
self |
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
217 |
electricDo:[ |
144
a43236d0c411
Indentation fixes for electric-inserted code.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
139
diff
changeset
|
218 |
stringOrLines isString ifTrue:[ |
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
219 |
"/ Simple strin |
144
a43236d0c411
Indentation fixes for electric-inserted code.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
139
diff
changeset
|
220 |
textView insertStringAtCursor:stringOrLines. |
137
12232e62cf54
Fixes in electring snippets (both in API and Smalltalk snippets)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
135
diff
changeset
|
221 |
] ifFalse:[ |
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
222 |
"/ C |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
223 |
textView insertLines:stringOrLines withCR:false. |
144
a43236d0c411
Indentation fixes for electric-inserted code.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
139
diff
changeset
|
224 |
]. |
a43236d0c411
Indentation fixes for electric-inserted code.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
139
diff
changeset
|
225 |
advanceCursor ifTrue:[ |
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
226 |
(textView cursorLine ~~ newCursorLine |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
227 |
or:[ textView cursorCol ~~ newCursorCol ]) |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
228 |
ifTrue:[ textView cursorLine:newCursorLine col:newCursorCol. ]. |
144
a43236d0c411
Indentation fixes for electric-inserted code.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
139
diff
changeset
|
229 |
]. |
155
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
230 |
]. |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
231 |
ignoreKeystrokeSequence notEmptyOrNil ifTrue:[ |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
232 |
ignoreKeystrokes := ignoreKeystrokeSequence. |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
233 |
ignoreKeystrokesPosition := 1. |
446
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
234 |
stringOrLines isString ifTrue:[ |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
235 |
ignoreKeystrokesStartLine := oldCursorLine. |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
236 |
ignoreKeystrokesStartCol := oldCursorCol + (stringOrLines size - ignoreKeystrokeSequence size) |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
237 |
]. |
155
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
238 |
]. |
144
a43236d0c411
Indentation fixes for electric-inserted code.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
139
diff
changeset
|
239 |
|
155
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
240 |
"Created: / 19-01-2014 / 20:29:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
446
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
241 |
"Modified: / 04-03-2015 / 06:29:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
137
12232e62cf54
Fixes in electring snippets (both in API and Smalltalk snippets)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
135
diff
changeset
|
242 |
! |
12232e62cf54
Fixes in electring snippets (both in API and Smalltalk snippets)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
135
diff
changeset
|
243 |
|
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
244 |
electricInsert:text ignoreKeystrokes:ignore |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
245 |
self |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
246 |
electricInsert:text |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
247 |
advanceCursorBy:nil |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
248 |
ignoreKeystrokes:ignore |
157
c71d2e62ece2
Refactored API of CompletionEngine - caller now must set up an context pass it.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
156
diff
changeset
|
249 |
|
c71d2e62ece2
Refactored API of CompletionEngine - caller now must set up an context pass it.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
156
diff
changeset
|
250 |
"Created: / 21-01-2014 / 23:29:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c71d2e62ece2
Refactored API of CompletionEngine - caller now must set up an context pass it.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
156
diff
changeset
|
251 |
! |
c71d2e62ece2
Refactored API of CompletionEngine - caller now must set up an context pass it.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
156
diff
changeset
|
252 |
|
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
253 |
electricInsertBlockOpenedBy:openText closedBy:closeText |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
254 |
| indent lines autoIndent | |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
255 |
|
134
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
256 |
textView completionSupport notNil ifTrue:[ |
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
257 |
(textView completionSupport) |
134
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
258 |
stopCompletionProcess; |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
259 |
closeCompletionView. |
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
260 |
]. |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
261 |
indent := self indentAtCursorLine. |
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
262 |
autoIndent := textView autoIndent. |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
263 |
textView autoIndent:false. |
137
12232e62cf54
Fixes in electring snippets (both in API and Smalltalk snippets)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
135
diff
changeset
|
264 |
[ |
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
265 |
textView |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
266 |
undoableDo:[ |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
267 |
lines := Array |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
268 |
with:openText ? '' |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
269 |
with:'' |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
270 |
with:((String new:indent withAll:Character space) , closeText). |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
271 |
self electricInsert:lines advanceCursorBy:1 @ (indent + 5) |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
272 |
]. |
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
273 |
] ensure:[ textView autoIndent:autoIndent ]. |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
274 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
275 |
"Created: / 25-07-2013 / 10:41:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
276 |
"Modified: / 22-01-2014 / 21:20:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
134
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
277 |
! |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
278 |
|
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
279 |
electricInsertSnippet |
134
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
280 |
^ false |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
281 |
|
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
282 |
"Created: / 22-10-2013 / 01:54:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
283 |
! ! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
284 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
285 |
!EditSupport methodsFor:'event handling'! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
286 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
287 |
keyPress: key x:x y:y in: view |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
288 |
"Handles an event in given view (a subview of codeView). |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
289 |
If the method returns true, the event will not be processed |
155
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
290 |
by the view. |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
291 |
|
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
292 |
IMPORTANT: Never ever call `^ super keyPress: key x:x y:y in: view`, |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
293 |
as keyPresIgnore... advances position and calling keyPressIgnore here |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
294 |
and calling super would advance it twice!! |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
295 |
" |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
296 |
|
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
297 |
view ~~ textView ifTrue:[ ^ false ]. |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
298 |
|
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
299 |
(self keyPressIgnored: key) ifTrue:[ |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
300 |
^ true. |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
301 |
]. |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
302 |
|
458
de41bf2025c0
Tests: fixed few bugs in electring edit support. More tests pass now.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
446
diff
changeset
|
303 |
UserPreferences current smallSenseElectricEditSupportEnabled ifFalse:[ ^ false ]. |
de41bf2025c0
Tests: fixed few bugs in electring edit support. More tests pass now.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
446
diff
changeset
|
304 |
|
134
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
305 |
key == Character space ifTrue:[ |
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
306 |
^ self electricInsertSnippet |
134
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
307 |
]. |
109
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
308 |
|
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
309 |
^false |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
310 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
311 |
"Created: / 24-07-2013 / 23:31:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
458
de41bf2025c0
Tests: fixed few bugs in electring edit support. More tests pass now.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
446
diff
changeset
|
312 |
"Modified: / 04-05-2015 / 00:01:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
155
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
313 |
! |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
314 |
|
274
2cfcd8eb9761
Fixes for issue #10: Extra characters inserted when typing too fast and complete-if-ambiguous is on
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
252
diff
changeset
|
315 |
keyPressIgnored |
2cfcd8eb9761
Fixes for issue #10: Extra characters inserted when typing too fast and complete-if-ambiguous is on
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
252
diff
changeset
|
316 |
"Advance position in keyPressIgnore buffer. Return true if position has been edvanced, false othwrwise" |
2cfcd8eb9761
Fixes for issue #10: Extra characters inserted when typing too fast and complete-if-ambiguous is on
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
252
diff
changeset
|
317 |
ignoreKeystrokes notNil ifTrue:[ |
2cfcd8eb9761
Fixes for issue #10: Extra characters inserted when typing too fast and complete-if-ambiguous is on
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
252
diff
changeset
|
318 |
ignoreKeystrokesPosition := ignoreKeystrokesPosition + 1. |
2cfcd8eb9761
Fixes for issue #10: Extra characters inserted when typing too fast and complete-if-ambiguous is on
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
252
diff
changeset
|
319 |
ignoreKeystrokesPosition > ignoreKeystrokes size ifTrue:[ |
2cfcd8eb9761
Fixes for issue #10: Extra characters inserted when typing too fast and complete-if-ambiguous is on
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
252
diff
changeset
|
320 |
"/ Nil out instvars if there's no more keys to ignore. |
2cfcd8eb9761
Fixes for issue #10: Extra characters inserted when typing too fast and complete-if-ambiguous is on
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
252
diff
changeset
|
321 |
ignoreKeystrokes := ignoreKeystrokesPosition := nil. |
2cfcd8eb9761
Fixes for issue #10: Extra characters inserted when typing too fast and complete-if-ambiguous is on
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
252
diff
changeset
|
322 |
]. |
2cfcd8eb9761
Fixes for issue #10: Extra characters inserted when typing too fast and complete-if-ambiguous is on
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
252
diff
changeset
|
323 |
^ true. |
2cfcd8eb9761
Fixes for issue #10: Extra characters inserted when typing too fast and complete-if-ambiguous is on
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
252
diff
changeset
|
324 |
]. |
2cfcd8eb9761
Fixes for issue #10: Extra characters inserted when typing too fast and complete-if-ambiguous is on
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
252
diff
changeset
|
325 |
^ false. |
2cfcd8eb9761
Fixes for issue #10: Extra characters inserted when typing too fast and complete-if-ambiguous is on
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
252
diff
changeset
|
326 |
|
2cfcd8eb9761
Fixes for issue #10: Extra characters inserted when typing too fast and complete-if-ambiguous is on
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
252
diff
changeset
|
327 |
"Created: / 11-08-2014 / 14:56:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2cfcd8eb9761
Fixes for issue #10: Extra characters inserted when typing too fast and complete-if-ambiguous is on
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
252
diff
changeset
|
328 |
! |
2cfcd8eb9761
Fixes for issue #10: Extra characters inserted when typing too fast and complete-if-ambiguous is on
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
252
diff
changeset
|
329 |
|
155
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
330 |
keyPressIgnored: key |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
331 |
ignoreKeystrokes notNil ifTrue:[ |
156
9b02027653ed
Fixed stc compilation error
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
155
diff
changeset
|
332 |
(ignoreKeystrokes at: ignoreKeystrokesPosition) == key ifTrue:[ |
155
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
333 |
"/ Key stroke should be ignored... |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
334 |
ignoreKeystrokesPosition := ignoreKeystrokesPosition + 1. |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
335 |
ignoreKeystrokesPosition > ignoreKeystrokes size ifTrue:[ |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
336 |
"/ Nil out instvars if there's no more keys to ignore. |
446
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
337 |
ignoreKeystrokes := ignoreKeystrokesPosition := ignoreKeystrokesStartLine := ignoreKeystrokesStartCol := nil. |
155
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
338 |
]. |
156
9b02027653ed
Fixed stc compilation error
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
155
diff
changeset
|
339 |
^ true. |
155
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
340 |
] ifFalse:[ |
446
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
341 |
"/ User continued typing something else. If it *seems* to be |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
342 |
"/ thet user wanted something else, then delete the rest, i.e., |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
343 |
"/ user typed: |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
344 |
"/ |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
345 |
"/ th |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
346 |
"/ |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
347 |
"/ then the machinery completed `isContext` so the text is |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
348 |
"/ |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
349 |
"/ thisContext |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
350 |
"/ |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
351 |
"/ and user continues typing `isValue`. In that case user wanted to |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
352 |
"/ `thisValue` instead of `thisContext` - in this case remove the rest |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
353 |
"/ of what has been completed. |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
354 |
"/ |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
355 |
"/ However, imagine following case: user types `th` so it completes |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
356 |
"/ `thisContext` like in previous case. Now the user types . (dot). |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
357 |
"/ to end the statement. In this case, perhaps `thisContext` is what |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
358 |
"/ he needs. |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
359 |
"/ |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
360 |
"/ How to tell between those two cases? |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
361 |
"/ |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
362 |
"/ Currently, a simple heuristics is used - if the typed character can be |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
363 |
"/ part of an identifier, then it's the former case, otherwise assume |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
364 |
"/ the latter. We'll see. |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
365 |
"/ |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
366 |
(key isCharacter and:[key isLetterOrDigit or:[key == $_]]) ifTrue:[ |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
367 |
ignoreKeystrokesStartLine notNil ifTrue:[ |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
368 |
textView deleteCharsAtLine: ignoreKeystrokesStartLine fromCol: ignoreKeystrokesStartCol + ignoreKeystrokesPosition - 1 toCol: ignoreKeystrokesStartCol + ignoreKeystrokes size - 1. |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
369 |
textView setCursorLine: ignoreKeystrokesStartLine. |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
370 |
textView setCursorCol: ignoreKeystrokesStartCol + ignoreKeystrokesPosition - (ignoreKeystrokesPosition > 1 ifTrue:[ 1 ] ifFalse:[ 0 ]). |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
371 |
]. |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
372 |
]. |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
373 |
ignoreKeystrokes := ignoreKeystrokesPosition := ignoreKeystrokesStartLine := ignoreKeystrokesStartCol := nil. |
156
9b02027653ed
Fixed stc compilation error
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
155
diff
changeset
|
374 |
^ false. |
155
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
375 |
]. |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
376 |
]. |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
377 |
^ false. |
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
378 |
|
d792aed09149
Initial support for ignoring keystrokes to avoid duplicate text when electric insert is active.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
379 |
"Created: / 20-01-2014 / 09:11:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
446
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
380 |
"Modified: / 05-03-2015 / 12:47:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
59afe5adfbf7
More fixes for #10: delete the rest of inserted text when typed text differ from inserted.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
381 |
"Modified (format): / 06-03-2015 / 07:08:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
134
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
382 |
! |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
383 |
|
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
384 |
keyPressSpace |
159
289c7ef539af
Improved support for electric bracket.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
385 |
^ self electricInsertSnippet |
134
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
386 |
|
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
387 |
"Created: / 22-10-2013 / 01:43:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
388 |
! ! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
389 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
390 |
!EditSupport methodsFor:'initialization'! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
391 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
392 |
initializeCompletion |
219
c69943a410fd
Do not cache completion controller in edit support.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
218
diff
changeset
|
393 |
| controller | |
c69943a410fd
Do not cache completion controller in edit support.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
218
diff
changeset
|
394 |
|
177
be588b60f4b2
Added preference to enable/disable SmallSense completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
176
diff
changeset
|
395 |
UserPreferences current smallSenseCompletionEnabled ifTrue:[ |
205
43bee6463c53
Introduced notion of `environment` to completion context.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
186
diff
changeset
|
396 |
self completionEngineClass notNil ifTrue:[ |
395
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
397 |
controller := self completionControllerClass for: textView. |
219
c69943a410fd
Do not cache completion controller in edit support.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
218
diff
changeset
|
398 |
controller support: self. |
395
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
399 |
textView completionSupport: controller. |
177
be588b60f4b2
Added preference to enable/disable SmallSense completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
176
diff
changeset
|
400 |
]. |
120
4fefce92f5bb
Initial support for Java/Groovy completion and for mixed-language completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
401 |
]. |
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
402 |
|
219
c69943a410fd
Do not cache completion controller in edit support.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
218
diff
changeset
|
403 |
"Created: / 18-05-2014 / 12:40:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
395
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
404 |
"Modified: / 11-02-2015 / 23:44:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
405 |
! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
406 |
|
395
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
407 |
initializeForService:anEditService |
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
408 |
completionEnvironment := anEditService environment. |
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
409 |
self initializeForTextView: anEditService textView. |
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
410 |
|
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
411 |
"Created: / 27-09-2013 / 13:19:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
412 |
"Modified: / 12-02-2015 / 00:16:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
413 |
! |
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
414 |
|
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
415 |
initializeForTextView: anEditTextView |
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
416 |
textView := anEditTextView. |
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
417 |
backspaceIsUndo := false. |
445
783f2a4af9c2
Electric insert: do not insert again and again when insertion was deleted by pressing backspace
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
418 |
electricInsertSuppressed := false. |
120
4fefce92f5bb
Initial support for Java/Groovy completion and for mixed-language completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
419 |
self initializeCompletion. |
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
420 |
|
395
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
421 |
"Created: / 12-02-2015 / 00:16:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
445
783f2a4af9c2
Electric insert: do not insert again and again when insertion was deleted by pressing backspace
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
422 |
"Modified: / 03-03-2015 / 17:14:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
423 |
! ! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
424 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
425 |
!EditSupport methodsFor:'private'! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
426 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
427 |
indentAtCursorLine |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
428 |
| line | |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
429 |
|
395
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
430 |
line := textView listAt: textView cursorLine. |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
431 |
^ line isNil ifTrue:[ |
395
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
432 |
(textView cursorCol - 1) max: 0. |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
433 |
] ifFalse:[ |
139
bf1538a4e7ce
Fixed off-by-one bug when computing indent level for closing curly.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
137
diff
changeset
|
434 |
(line indexOfNonSeparator - 1) max: 0. |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
435 |
] |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
436 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
437 |
"Created: / 25-07-2013 / 00:13:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
395
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
438 |
"Modified: / 11-02-2015 / 23:44:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
439 |
! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
440 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
441 |
wordBeforeCursor |
185
75738108cc3f
Support for Tab in code completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
442 |
^ self wordBeforeCursorConsisitingOfCharactersMatching: [:c | c isAlphaNumeric ]. |
132
7c23c51d2cfd
Completion insertion refactoring.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
122
diff
changeset
|
443 |
|
185
75738108cc3f
Support for Tab in code completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
444 |
"Created: / 27-09-2013 / 15:53:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
75738108cc3f
Support for Tab in code completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
445 |
"Modified: / 31-03-2014 / 23:03:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
75738108cc3f
Support for Tab in code completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
446 |
! |
75738108cc3f
Support for Tab in code completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
447 |
|
75738108cc3f
Support for Tab in code completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
448 |
wordBeforeCursorConsisitingOfCharactersMatching: characterMatchBlock |
75738108cc3f
Support for Tab in code completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
449 |
| currentLine wordStart wordEnd | |
239
e1b7b5f0f4b7
Bug fix in completion (#updateSelection).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
450 |
currentLine := textView list at: textView cursorLine ifAbsent:[ ^ '' ]. |
109
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
451 |
currentLine isNil ifTrue:[ ^ '' ]. |
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
452 |
wordEnd := textView cursorCol - 1. |
110
5ee9a90dbed5
Bug/UX fixes for autocomplete.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
109
diff
changeset
|
453 |
wordEnd > currentLine size ifTrue:[ ^ '' ]. |
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
454 |
wordEnd ~~ 0 ifTrue:[ |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
455 |
wordStart := wordEnd. |
185
75738108cc3f
Support for Tab in code completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
456 |
[ wordStart > 0 and:[characterMatchBlock value:(currentLine at: wordStart) ] ] whileTrue:[ |
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
457 |
wordStart := wordStart - 1. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
458 |
]. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
459 |
wordStart := wordStart + 1. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
460 |
wordStart <= wordEnd ifTrue:[ |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
461 |
^ currentLine copyFrom: wordStart to: wordEnd. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
462 |
]. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
463 |
]. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
464 |
^ '' |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
465 |
|
185
75738108cc3f
Support for Tab in code completion.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
466 |
"Created: / 31-03-2014 / 23:02:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
239
e1b7b5f0f4b7
Bug fix in completion (#updateSelection).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
467 |
"Modified: / 17-06-2014 / 07:27:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
468 |
! ! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
469 |
|
134
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
470 |
!EditSupport methodsFor:'private-scanning'! |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
471 |
|
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
472 |
scanLineAt: lineNumber |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
473 |
"Scans line at given line number. |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
474 |
|
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
475 |
Returns and array of tokens, **excluding** EOF. Each token is represented |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
476 |
by four subsequent items in the array: token type, token value, start position, end position. |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
477 |
Thus, returned array size is always multiple of 4." |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
478 |
|
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
479 |
^ self scanLineAt: lineNumber using: self scannerClass |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
480 |
|
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
481 |
"Created: / 22-10-2013 / 00:34:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
482 |
! |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
483 |
|
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
484 |
scanLineAt: lineNumber using: scannerClass |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
485 |
"Scans line at given line number using given scanner class. |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
486 |
|
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
487 |
Returns and array of tokens, **excluding** EOF. Each token is represented |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
488 |
by four subsequent items in the array: token type, token value, start position, end position. |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
489 |
Thus, returned array size is always multiple of 4." |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
490 |
|
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
491 |
| line scanner token tokenLastEndPosition | |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
492 |
|
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
493 |
scannerClass isNil ifTrue:[ ^ #() ]. |
395
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
494 |
line := textView listAt: textView cursorLine. |
134
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
495 |
line isNil ifTrue:[ ^ #() ]. |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
496 |
scanner := scannerClass for: line string. |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
497 |
tokenLastEndPosition := 0. |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
498 |
^ OrderedCollection streamContents:[:tokens | |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
499 |
[ |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
500 |
[ token := scanner nextToken.token ~~ #EOF ] whileTrue:[ |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
501 |
tokens |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
502 |
nextPut: token; |
137
12232e62cf54
Fixes in electring snippets (both in API and Smalltalk snippets)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
135
diff
changeset
|
503 |
nextPut: (scanner tokenName notNil ifTrue:[scanner tokenName] ifFalse:[ scanner tokenValue printString ]); |
134
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
504 |
nextPut: scanner tokenStartPosition; |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
505 |
nextPut: (tokenLastEndPosition := scanner tokenEndPosition). |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
506 |
]. |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
507 |
] on: Error do:[ |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
508 |
tokens |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
509 |
nextPut: 'Error'; |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
510 |
nextPut: (line copyFrom: tokenLastEndPosition + 1 to: line size); |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
511 |
nextPut: tokenLastEndPosition + 1; |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
512 |
nextPut: line size. |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
513 |
]. |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
514 |
]. |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
515 |
|
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
516 |
"Created: / 22-10-2013 / 00:31:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
395
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
517 |
"Modified: / 11-02-2015 / 23:43:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
134
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
518 |
! |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
519 |
|
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
520 |
scanLineAtCursor |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
521 |
"Scans current cursor line. |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
522 |
|
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
523 |
Returns and array of tokens, **excluding** EOF. Each token is represented |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
524 |
by four subsequent items in the array: token type, token value, start position, end position. |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
525 |
Thus, returned array size is always multiple of 4." |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
526 |
|
395
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
527 |
^ self scanLineAt: textView cursorLine using: self scannerClass |
134
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
528 |
|
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
529 |
"Created: / 22-10-2013 / 00:34:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
395
25ed27eaeaae
Completion: added support for SmallSense completion in an inspector views.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
374
diff
changeset
|
530 |
"Modified: / 11-02-2015 / 23:44:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
134
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
531 |
! ! |
e34ee6ceb7c8
Initial support for "electric snippets".
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
132
diff
changeset
|
532 |
|
112
5c8f0eb0dd55
UX fixes for completion: do not close the completionwindow then pressing Ctrl-space
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
110
diff
changeset
|
533 |
!EditSupport class methodsFor:'documentation'! |
5c8f0eb0dd55
UX fixes for completion: do not close the completionwindow then pressing Ctrl-space
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
110
diff
changeset
|
534 |
|
5c8f0eb0dd55
UX fixes for completion: do not close the completionwindow then pressing Ctrl-space
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
110
diff
changeset
|
535 |
version_HG |
5c8f0eb0dd55
UX fixes for completion: do not close the completionwindow then pressing Ctrl-space
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
110
diff
changeset
|
536 |
|
5c8f0eb0dd55
UX fixes for completion: do not close the completionwindow then pressing Ctrl-space
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
110
diff
changeset
|
537 |
^ '$Changeset: <not expanded> $' |
5c8f0eb0dd55
UX fixes for completion: do not close the completionwindow then pressing Ctrl-space
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
110
diff
changeset
|
538 |
! ! |
5c8f0eb0dd55
UX fixes for completion: do not close the completionwindow then pressing Ctrl-space
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
110
diff
changeset
|
539 |