author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Mon, 30 Sep 2013 14:19:24 +0100 | |
changeset 110 | 5ee9a90dbed5 |
parent 109 | 59448a46a48f |
child 112 | 5c8f0eb0dd55 |
permissions | -rw-r--r-- |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1 |
"{ Package: 'jv:smallsense' }" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
2 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
3 |
"{ NameSpace: SmallSense }" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
4 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
5 |
Object subclass:#EditSupport |
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
6 |
instanceVariableNames:'service textView backspaceIsUndo completionController' |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
7 |
classVariableNames:'' |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
8 |
poolDictionaries:'' |
67
020b7461b15e
Package structure reorganization.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
64
diff
changeset
|
9 |
category:'SmallSense-Core-Services' |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
10 |
! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
11 |
|
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
12 |
EditTextViewCompletionSupport subclass:#CompletionController |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
13 |
instanceVariableNames:'support' |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
14 |
classVariableNames:'' |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
15 |
poolDictionaries:'' |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
16 |
privateIn:EditSupport |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
17 |
! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
18 |
|
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
19 |
!EditSupport class methodsFor:'instance creation'! |
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 |
forLanguage: aProgrammingLanguage |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
22 |
aProgrammingLanguage notNil ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
23 |
aProgrammingLanguage isSmalltalk ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
24 |
^ SmalltalkEditSupport new |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
25 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
26 |
aProgrammingLanguage isJava ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
27 |
^ JavaEditSupport new |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
28 |
] |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
29 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
30 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
31 |
^GenericEditSupport new. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
32 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
33 |
"Created: / 24-07-2013 / 23:20:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
34 |
"Modified: / 04-08-2013 / 02:06:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
35 |
! ! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
36 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
37 |
!EditSupport methodsFor:'accessing'! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
38 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
39 |
language |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
40 |
^ self subclassResponsibility. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
41 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
42 |
"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
|
43 |
! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
44 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
45 |
service |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
46 |
^ service |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
47 |
! ! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
48 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
49 |
!EditSupport methodsFor:'editing'! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
50 |
|
89
8ff5fb2b27bf
Improvement in (Smalltalk)EditSupport.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
51 |
insertDo: aBlock |
8ff5fb2b27bf
Improvement in (Smalltalk)EditSupport.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
52 |
textView hasSelection ifTrue:[ |
8ff5fb2b27bf
Improvement in (Smalltalk)EditSupport.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
53 |
textView undoableDo:[ |
8ff5fb2b27bf
Improvement in (Smalltalk)EditSupport.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
54 |
textView deleteSelection |
8ff5fb2b27bf
Improvement in (Smalltalk)EditSupport.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
55 |
]. |
8ff5fb2b27bf
Improvement in (Smalltalk)EditSupport.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
56 |
]. |
8ff5fb2b27bf
Improvement in (Smalltalk)EditSupport.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
57 |
textView undoableDo: [ |
8ff5fb2b27bf
Improvement in (Smalltalk)EditSupport.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
58 |
aBlock value. |
8ff5fb2b27bf
Improvement in (Smalltalk)EditSupport.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
59 |
]. |
8ff5fb2b27bf
Improvement in (Smalltalk)EditSupport.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
60 |
backspaceIsUndo := true. |
8ff5fb2b27bf
Improvement in (Smalltalk)EditSupport.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
61 |
|
8ff5fb2b27bf
Improvement in (Smalltalk)EditSupport.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
62 |
"Created: / 17-09-2013 / 23:15:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
8ff5fb2b27bf
Improvement in (Smalltalk)EditSupport.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
63 |
! |
8ff5fb2b27bf
Improvement in (Smalltalk)EditSupport.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
64 |
|
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
65 |
insertElectricBlockOpenedBy: openText closedBy: closeText |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
66 |
| line col indent | |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
67 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
68 |
indent := self indentAtCursorLine. |
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 |
textView undoableDo:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
71 |
textView insertStringAtCursor: (openText ? '') , Character cr , Character cr, (String new:indent withAll:Character space) , closeText , Character cr. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
72 |
line := textView cursorLine - 1. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
73 |
col := textView cursorCol + 3. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
74 |
textView cursorLine: line col: col. |
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 |
"Created: / 25-07-2013 / 10:41:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
78 |
"Modified: / 04-08-2013 / 02:15:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
79 |
! ! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
80 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
81 |
!EditSupport methodsFor:'event handling'! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
82 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
83 |
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
|
84 |
"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
|
85 |
If the method returns true, the event will not be processed |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
86 |
by the view." |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
87 |
|
109
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
88 |
|
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
89 |
^false |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
90 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
91 |
"Created: / 24-07-2013 / 23:31:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
109
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
92 |
"Modified: / 27-09-2013 / 23:53:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
93 |
! ! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
94 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
95 |
!EditSupport methodsFor:'initialization'! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
96 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
97 |
initializeCompletion |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
98 |
completionController := CompletionController for: service textView. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
99 |
completionController support: self. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
100 |
service textView completionSupport: completionController. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
101 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
102 |
"Created: / 27-09-2013 / 13:20:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
103 |
! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
104 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
105 |
initializeForService:aSmallSenseService |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
106 |
service := aSmallSenseService. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
107 |
textView := aSmallSenseService textView. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
108 |
backspaceIsUndo := false. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
109 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
110 |
"Created: / 27-09-2013 / 13:19:20 / 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
|
111 |
! ! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
112 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
113 |
!EditSupport methodsFor:'private'! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
114 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
115 |
indentAtCursorLine |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
116 |
| line | |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
117 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
118 |
line := service textView listAt: service textView cursorLine. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
119 |
^ line isNil ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
120 |
service textView cursorCol - 1. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
121 |
] ifFalse:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
122 |
line indexOfNonSeparator - 1. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
123 |
] |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
124 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
125 |
"Created: / 25-07-2013 / 00:13:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
126 |
"Modified: / 04-08-2013 / 02:13:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
127 |
! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
128 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
129 |
wordBeforeCursor |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
130 |
| currentLine wordStart wordEnd | |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
131 |
currentLine := textView list at: textView cursorLine. |
109
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
132 |
currentLine isNil ifTrue:[ ^ '' ]. |
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
133 |
wordEnd := textView cursorCol - 1. |
110
5ee9a90dbed5
Bug/UX fixes for autocomplete.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
109
diff
changeset
|
134 |
wordEnd > currentLine size ifTrue:[ ^ '' ]. |
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
135 |
wordEnd ~~ 0 ifTrue:[ |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
136 |
wordStart := wordEnd. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
137 |
[ wordStart > 0 and:[(currentLine at: wordStart) isAlphaNumeric] ] whileTrue:[ |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
138 |
wordStart := wordStart - 1. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
139 |
]. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
140 |
wordStart := wordStart + 1. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
141 |
wordStart <= wordEnd ifTrue:[ |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
142 |
^ currentLine copyFrom: wordStart to: wordEnd. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
143 |
]. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
144 |
]. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
145 |
^ '' |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
146 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
147 |
"Created: / 27-09-2013 / 15:53:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
110
5ee9a90dbed5
Bug/UX fixes for autocomplete.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
109
diff
changeset
|
148 |
"Modified: / 28-09-2013 / 03:06:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
149 |
! ! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
150 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
151 |
!EditSupport methodsFor:'private-completion'! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
152 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
153 |
computeCompletion |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
154 |
"Compute completion and return a CompletionResult" |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
155 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
156 |
self subclassResponsibility |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
157 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
158 |
"Created: / 27-09-2013 / 13:14:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
159 |
! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
160 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
161 |
insertCompletion: item |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
162 |
"Insert given completion item at cursor position" |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
163 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
164 |
| po stringToComplete stringAlreadyWritten stringToInsert | |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
165 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
166 |
po := item. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
167 |
stringToComplete := po stringToComplete. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
168 |
stringAlreadyWritten := self wordBeforeCursor. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
169 |
stringToInsert := stringToComplete copyFrom: (stringAlreadyWritten size + 1). |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
170 |
textView isCodeView2 ifTrue:[textView := textView textView]. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
171 |
textView undoableDo:[ |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
172 |
(stringToComplete startsWith: stringAlreadyWritten) ifTrue:[ |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
173 |
textView insertStringAtCursor: stringToInsert. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
174 |
] ifFalse:[ |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
175 |
| startCol endCol | |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
176 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
177 |
endCol := textView cursorCol - 1. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
178 |
startCol := textView cursorCol - stringAlreadyWritten size. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
179 |
textView insertStringAtCursor: stringToComplete. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
180 |
textView deleteFromLine:textView cursorLine col: startCol toLine:textView cursorLine col:endCol. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
181 |
textView cursorCol: startCol + stringToComplete size. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
182 |
]. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
183 |
]. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
184 |
textView cursorCol: textView cursorCol - stringToComplete size + po cursorColumnAfterComplete. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
185 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
186 |
"Created: / 27-09-2013 / 15:40:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
187 |
! ! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
188 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
189 |
!EditSupport::CompletionController methodsFor:'accessing'! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
190 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
191 |
support |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
192 |
^ support |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
193 |
! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
194 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
195 |
support:anEditSupport |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
196 |
support := anEditSupport. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
197 |
! ! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
198 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
199 |
!EditSupport::CompletionController methodsFor:'events'! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
200 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
201 |
handleKeyPress:key x:x y:y |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
202 |
|
109
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
203 |
key == #CodeCompletion ifTrue: [ |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
204 |
autoSelect := true. |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
205 |
self startCompletionProcess. |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
206 |
]. |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
207 |
|
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
208 |
(key == #BackSpace or:[key == #BasicBackspace]) ifTrue:[ |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
209 |
| c | |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
210 |
|
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
211 |
c := editView characterBeforeCursor. |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
212 |
(c notNil and:[c isAlphaNumeric]) ifTrue:[ |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
213 |
^ false |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
214 |
]. |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
215 |
]. |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
216 |
|
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
217 |
|
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
218 |
completionView notNil ifTrue:[ |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
219 |
(key == #Return and:[completionView hasSelection]) ifTrue:[ |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
220 |
self complete. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
221 |
^ true. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
222 |
]. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
223 |
key isCharacter ifTrue:[ |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
224 |
self updateSelection. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
225 |
]. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
226 |
]. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
227 |
^ super handleKeyPress:key x:x y:y |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
228 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
229 |
"Created: / 27-09-2013 / 15:38:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
109
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
230 |
"Modified: / 28-09-2013 / 00:16:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
231 |
! |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
232 |
|
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
233 |
postKeyPress:key |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
234 |
UserPreferences current immediateCodeCompletion ifFalse:[ |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
235 |
"/ only update, if already open |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
236 |
completionView isNil ifTrue:[^ self]. |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
237 |
]. |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
238 |
|
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
239 |
(key == #BackSpace or:[key == #BasicBackspace]) ifTrue:[ |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
240 |
| c | |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
241 |
|
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
242 |
c := editView characterBeforeCursor. |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
243 |
(c notNil and:[c isLetterOrDigit]) ifTrue:[ |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
244 |
autoSelect := false. |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
245 |
self updateCompletionList. |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
246 |
] ifFalse:[ |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
247 |
self closeCompletionView. |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
248 |
]. |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
249 |
^ self |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
250 |
]. |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
251 |
|
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
252 |
key isCharacter ifTrue:[ |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
253 |
key isLetterOrDigit not ifTrue:[ |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
254 |
self closeCompletionView |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
255 |
] ifFalse:[ |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
256 |
autoSelect := false. |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
257 |
self updateCompletionList. |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
258 |
]. |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
259 |
^ self |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
260 |
]. |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
261 |
|
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
262 |
"Created: / 28-09-2013 / 00:21:00 / 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
|
263 |
! ! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
264 |
|
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
265 |
!EditSupport::CompletionController methodsFor:'private'! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
266 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
267 |
complete |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
268 |
support insertCompletion: completionView selection. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
269 |
self closeCompletionView. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
270 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
271 |
"Created: / 27-09-2013 / 15:38:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
272 |
! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
273 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
274 |
updateCompletionList |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
275 |
"called for keypress events" |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
276 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
277 |
completionView isNil ifTrue:[ |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
278 |
super updateCompletionList |
109
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
279 |
] ifFalse:[ |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
280 |
self updateSelection. |
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
281 |
]. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
282 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
283 |
"Created: / 27-09-2013 / 15:58:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
109
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
284 |
"Modified: / 28-09-2013 / 00:15:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
285 |
! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
286 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
287 |
updateSelection |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
288 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
289 |
| matches word | |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
290 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
291 |
word := support wordBeforeCursor. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
292 |
matches := completionView list select:[:po | po stringToComplete startsWith: word ]. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
293 |
matches notEmptyOrNil ifTrue:[ |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
294 |
completionView selection: (matches inject: matches anElement into:[:shortest :each | |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
295 |
each stringToComplete size < shortest stringToComplete size |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
296 |
ifTrue:[each] |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
297 |
ifFalse:[shortest] |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
298 |
]). |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
299 |
] ifFalse:[ |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
300 |
completionView selection: nil. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
301 |
] |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
302 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
303 |
"Created: / 27-09-2013 / 16:16:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
304 |
! ! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
305 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
306 |
!EditSupport::CompletionController methodsFor:'private-API'! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
307 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
308 |
computeCompletions |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
309 |
"Actually compute the completions and update the completion view." |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
310 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
311 |
| completions | |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
312 |
|
110
5ee9a90dbed5
Bug/UX fixes for autocomplete.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
109
diff
changeset
|
313 |
"/ Wait a while to give user chance finish typing. |
5ee9a90dbed5
Bug/UX fixes for autocomplete.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
109
diff
changeset
|
314 |
"/ This also reduces CPU consumption by avoiding |
5ee9a90dbed5
Bug/UX fixes for autocomplete.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
109
diff
changeset
|
315 |
"/ useless computation |
5ee9a90dbed5
Bug/UX fixes for autocomplete.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
109
diff
changeset
|
316 |
Delay waitForMilliseconds: 200. |
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
317 |
completions := support computeCompletion. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
318 |
completions notEmptyOrNil ifTrue:[ |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
319 |
editView sensor pushUserEvent: #updateCompletions: for: self withArgument: completions. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
320 |
]. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
321 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
322 |
"Created: / 27-09-2013 / 13:12:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
110
5ee9a90dbed5
Bug/UX fixes for autocomplete.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
109
diff
changeset
|
323 |
"Modified: / 30-09-2013 / 11:53: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
|
324 |
! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
325 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
326 |
openCompletionView |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
327 |
self openCompletionView: #() |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
328 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
329 |
"Created: / 27-09-2013 / 16:17:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
330 |
! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
331 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
332 |
openCompletionView: list |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
333 |
"Makes sure the completion view is opened and with given `list`." |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
334 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
335 |
| movePos topView x y| |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
336 |
"/ move the window |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
337 |
|
109
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
338 |
list isEmpty ifTrue:[ ^ self ]. |
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
339 |
|
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
340 |
x := (editView xOfCol:editView cursorCol inVisibleLine:editView cursorLine) |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
341 |
- 16"icon" - (editView widthOfString: support wordBeforeCursor) - 5"magic constant". |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
342 |
y := editView yOfCursor + editView font maxHeight + 3. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
343 |
movePos := (editView originRelativeTo: nil) + (x @ y). |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
344 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
345 |
completionView isNil ifTrue:[ |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
346 |
completionView := CompletionView new. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
347 |
completionView list:list. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
348 |
completionView font: editView font. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
349 |
topView := completionView. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
350 |
topView origin:movePos. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
351 |
"/ topView resizeToFit. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
352 |
self updateSelection. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
353 |
topView open. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
354 |
] ifFalse:[ |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
355 |
completionView list:list. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
356 |
self updateSelection. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
357 |
"/ topView := completionView topView. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
358 |
"/ topView ~~ completionView ifTrue:[ |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
359 |
"/ topView origin:movePos. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
360 |
"/ topView resizeToFit. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
361 |
"/ ] |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
362 |
]. |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
363 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
364 |
"Created: / 27-09-2013 / 14:01:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
109
59448a46a48f
Completion refactoring (part 2).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
108
diff
changeset
|
365 |
"Modified: / 27-09-2013 / 23:54:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
108
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
366 |
! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
367 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
368 |
updateCompletions: completionResult |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
369 |
self openCompletionView: completionResult |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
370 |
|
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
371 |
"Created: / 27-09-2013 / 13:52:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
372 |
! ! |
71471dc81e77
Completion refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
100
diff
changeset
|
373 |