8000 Merge 3c37d8a9c7a71d85dfe9af756cfcf6af785f03df · feenkcom/Brick@60e701a · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Commit 60e701a

Browse files
refactoringdrrefactoringdr
committed
Merge 3c37d8a 
2 parents 971ae81 + 3c37d8a commit 60e701a

File tree

126 files changed

+6249
-4809
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+6249
-4809
lines changed

‎src/Brick-Classifiers/BrAlphanumericUnderscoreWordClassifier.class.st

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Class {
77
{ #category : #'as yet unclassified' }
88
BrAlphanumericUnderscoreWordClassifier >> itself [
99
<gtExample>
10+
<return: #BrAlphanumericUnderscoreWordClassifier>
1011
^ self
1112
]
1213

‎src/Brick-Classifiers/BrCamelCaseWordClassifier.class.st

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Class {
77
{ #category : #'as yet unclassified' }
88
BrCamelCaseWordClassifier >> itself [
99
<gtExample>
10+
<return: #BrCamelCaseWordClassifier>
1011
^ self
1112
]
1213

‎src/Brick-Classifiers/BrSmalltalkWordClassifier.class.st

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Class {
77
{ #category : #'as yet unclassified' }
88
BrSmalltalkWordClassifier >> itself [
99
<gtExample>
10+
<return: #BrSmalltalkWordClassifier>
1011
^ self
1112
]
1213

‎src/Brick-Editor-Examples/BrEditorShortcutExamples.class.st

+124-84
Original file line numberDiff line numberDiff line change
@@ -7,171 +7,211 @@ Class {
77
{ #category : #accessing }
88
BrEditorShortcutExamples >> deleteOneLetterAfterCursorWithSelection [
99
<gtExample>
10+
<return: #BrEditor>
1011
| anEditorElement anEditor |
11-
1212
anEditorElement := BrTextEditorOperatorExamples new editorOnMultilineText.
1313
anEditor := anEditorElement editor.
14-
14+
1515
anEditor selecter
1616
from: 3 to: 7;
1717
select.
1818
anEditor navigator
1919
moveTo: 3;
2020
apply.
21-
22-
self assert: anEditor selection equals: (BlCompositeSelection new select: 3 to: 7).
23-
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: { 3 }).
24-
21+
22+
self
23+
assert: anEditor selection
24+
equals: (BlCompositeSelection new select: 3 to: 7).
25+
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: {3}).
26+
2527
BrEditorShortcut deleteOneLetterAfterCursor
26-
performOnEditor: anEditor element: anEditorElement dueTo: nil.
27-
28+
performOnEditor: anEditor
29+
element: anEditorElement
30+
dueTo: nil.
31+
2832
self assert: (anEditor text from: 3 to: 4) asString equals: 'sr'.
29-
self assert: anEditor selection equals: (BlCompositeSelection new).
30-
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: { 3 }).
31-
33+
self assert: anEditor selection equals: BlCompositeSelection new.
34+
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: {3}).
35+
3236
^ anEditorElement
3337
]
3438

3539
{ #category : #accessing }
3640
BrEditorShortcutExamples >> deleteOneLetterAfterCursorWithSelectionBeforeCursor [
3741
<gtExample>
42+
<return: #BrEditor>
3843
| anEditorElement anEditor |
39-
4044
anEditorElement := BrTextEditorOperatorExamples new editorOnMultilineText.
4145
anEditor := anEditorElement editor.
42-
46+
4347
anEditor selecter
4448
from: 3 to: 7;
4549
select.
46-
47-
self assert: anEditor selection equals: (BlCompositeSelection new select: 3 to: 7).
48-
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: { 7 }).
49-
50+
51+
self
52+
assert: anEditor selection
53+
equals: (BlCompositeSelection new select: 3 to: 7).
54+
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: {7}).
55+
5056
BrEditorShortcut deleteOneLetterAfterCursor
51-
performOnEditor: anEditor element: anEditorElement dueTo: nil.
52-
57+
performOnEditor: anEditor
58+
element: anEditorElement
59+
dueTo: nil.
60+
5361
self assert: (anEditor text from: 3 to: 4) asString equals: 'sr'.
54-
self assert: anEditor selection equals: (BlCompositeSelection new).
55-
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: { 3 }).
56-
62+
self assert: anEditor selection equals: BlCompositeSelection new.
63+
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: {3}).
64+
5765
^ anEditorElement
5866
]
5967

6068
{ #category : #accessing }
6169
BrEditorShortcutExamples >> deleteOneLetterBeforeCursorWithSelection [
6270
<gtExample>
71+
<return: #BrEditor>
6372
| anEditorElement anEditor |
64-
6573
anEditorElement := BrTextEditorOperatorExamples new editorOnMultilineText.
6674
anEditor := anEditorElement editor.
67-
75+
6876
anEditor selecter
6977
from: 3 to: 7;
7078
select.
71-
72-
self assert: anEditor selection equals: (BlCompositeSelection new select: 3 to: 7).
73-
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: { 7 }).
74-
79+
80+
self
81+
assert: anEditor selection
82+
equals: (BlCompositeSelection new select: 3 to: 7).
83+
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: {7}).
84+
7585
BrEditorShortcut deleteOneLetterBeforeCursor
76-
performOnEditor: anEditor element: anEditorElement dueTo: nil.
77-
86+
performOnEditor: anEditor
87+
element: anEditorElement
88+
dueTo: nil.
89+
7890
self assert: (anEditor text from: 3 to: 4) asString equals: 'sr'.
79-
self assert: anEditor selection equals: (BlCompositeSelection new).
80-
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: { 3 }).
81-
91+
self assert: anEditor selection equals: BlCompositeSelection new.
92+
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: {3}).
93+
8294
^ anEditorElement
8395
]
8496

8597
{ #category : #accessing }
8698
BrEditorShortcutExamples >> deleteOneLetterBeforeCursorWithSelectionAfterCursor [
8799
<gtExample>
100+
<return: #BrEditor>
88101
| anEditorElement anEditor |
89-
90102
anEditorElement := BrTextEditorOperatorExamples new editorOnMultilineText.
91103
anEditor := anEditorElement editor.
92-
104+
93105
anEditor selecter
94106
from: 3 to: 7;
95107
select.
96108
anEditor navigator
97109
moveTo: 3;
98110
apply.
99-
100-
self assert: anEditor selection equals: (BlCompositeSelection new select: 3 to: 7).
101-
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: { 3 }).
102-
111+
112+
self
113+
assert: anEditor selection
114+
equals: (BlCompositeSelection new select: 3 to: 7).
115+
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: {3}).
116+
103117
BrEditorShortcut deleteOneLetterBeforeCursor
104-
performOnEditor: anEditor element: anEditorElement dueTo: nil.
105-
118+
performOnEditor: anEditor
119+
element: anEditorElement
120+
dueTo: nil.
121+
106122
self assert: (anEditor text from: 3 to: 4) asString equals: 'sr'.
107-
self assert: anEditor selection equals: (BlCompositeSelection new).
108-
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: { 3 }).
109-
123+
self assert: anEditor selection equals: BlCompositeSelection new.
124+
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: {3}).
125+
110126
^ anEditorElement
111127
]
112128

113129
{ #category : #accessing }
114130
BrEditorShortcutExamples >> deleteWordAfterCursor [
115131
<gtExample>
132+
<return: #BrEditor>
116133
| anEditorElement anEditor |
117-
118134
anEditorElement := BrTextEditorOperatorExamples new editorOnMultilineText.
119135
anEditor := anEditorElement editor.
120-
136+
121137
anEditor navigator
122138
moveTo: 51;
123139
apply.
124140

125-
BrEditorShortcut deleteNextWord
126-
performOnEditor: anEditor element: anEditorElement dueTo: nil.
127-
128-
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: { 51 }).
129-
self assert: (anEditor text from: 43 to: 64) asString equals: 'with sand in my hands!'.
130-
131-
BrEditorShortcut deleteNextWord
132-
performOnEditor: anEditor element: anEditorElement dueTo: nil.
133-
134-
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: { 51 }).
135-
self assert: (anEditor text from: 43 to: 63) asString equals: 'with sandin my hands!'.
136-
137-
BrEditorShortcut deleteNextWord
138-
performOnEditor: anEditor element: anEditorElement dueTo: nil.
139-
140-
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: { 51 }).
141-
self assert: (anEditor text from: 43 to: 61) asString equals: 'with sand my hands!'.
142-
141+
BrEditorShortcut deleteNextWord
142+
performOnEditor: anEditor
143+
element: anEditorElement
144+
dueTo: nil.
145+
146+
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: {51}).
147+
self
148+
assert: (anEditor text from: 43 to: 64) asString
149+
equals: 'with sand in my hands!'.
150+
151+
BrEditorShortcut deleteNextWord
152+
performOnEditor: anEditor
153+
element: anEditorElement
154+
dueTo: nil.
155+
156+
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: {51}).
157+
self
158+
assert: (anEditor text from: 43 to: 63) asString
159+
equals: 'with sandin my hands!'.
160+
161+
BrEditorShortcut deleteNextWord
162+
performOnEditor: anEditor
163+
element: anEditorElement
164+
dueTo: nil.
165+
166+
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: {51}).
167+
self
168+
assert: (anEditor text from: 43 to: 61) asString
169+
equals: 'with sand my hands!'.
170+
143171
^ anEditorElement
144172
]
145173

146174
{ #category : #accessing }
147175
BrEditorShortcutExamples >> deleteWordBeforeCursor [
148176
<gtExample>
177+
<return: #BrEditor>
149178
| anEditorElement anEditor |
150-
151179
anEditorElement := BrTextEditorOperatorExamples new editorOnMultilineText.
152180
anEditor := anEditorElement editor.
153-
181+
154182
anEditor navigator
155183
moveTo: 51;
156184
apply.
157185

158-
BrEditorShortcut deletePreviousWord
159-
performOnEditor: anEditor element: anEditorElement dueTo: nil.
160-
161-
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: { 47 }).
162-
self assert: (anEditor text from: 43 to: 63) asString equals: 'with als in my hands!'.
163-
164-
BrEditorShortcut deletePreviousWord
165-
performOnEditor: anEditor element: anEditorElement dueTo: nil.
166-
167-
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: { 46 }).
168-
self assert: (anEditor text from: 43 to: 62) asString equals: 'withals in my hands!'.
169-
170-
BrEditorShortcut deletePreviousWord
171-
performOnEditor: anEditor element: anEditorElement dueTo: nil.
172-
173-
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: { 42 }).
174-
self assert: (anEditor text from: 43 to: 58) asString equals: 'als in my hands!'.
175-
186+
BrEditorShortcut deletePreviousWord
187+
performOnEditor: anEditor
188+
element: anEditorElement
189+
dueTo: nil.
190+
191+
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: {47}).
192+
self
193+
assert: (anEditor text from: 43 to: 63) asString
194+
equals: 'with als in my hands!'.
195+
196+
BrEditorShortcut deletePreviousWord
197+
performOnEditor: anEditor
198+
element: anEditorElement
199+
dueTo: nil.
200+
201+
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: {46}).
202+
self
203+
assert: (anEditor text from: 43 to: 62) asString
204+
equals: 'withals in my hands!'.
205+
206+
BrEditorShortcut deletePreviousWord
207+
performOnEditor: anEditor
208+
element: anEditorElement
209+
dueTo: nil.
210+
211+
self assert: anEditor cursors equals: (BrTextEditorCursor atAll: {42}).
212+
self
213+
assert: (anEditor text from: 43 to: 58) asString
214+
equals: 'als in my hands!'.
215+
176216
^ anEditorElement
177217
]

‎src/Brick-Editor-Examples/BrEditorTextFlowLayoutExamples.class.st

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
11
Class {
22
#name : #BrEditorTextFlowLayoutExamples,
33
#superclass : #Object,
4-
#category : 'Brick-Editor-Examples-Layout'
4+
#category : #'Brick-Editor-Examples-Layout'
55
}
66

77
{ #category : #'instance creation' }
88
BrEditorTextFlowLayoutExamples >> container [
99
<gtExample>
10+
<return: #BlElement>
1011
| anElement |
11-
1212
anElement := BlElement new
13-
layout: (BrEditorTextFlowLayout new lineSpacing: 10);
14-
constraintsDo: [ :c |
15-
c horizontal exact: 500.
16-
c vertical fitContent ];
17-
addChildren: (20 timesCollect: [
18-
BlElement new
19-
size: 75@30;
20-
margin: (BlInsets all: 4);
21-
background: (Color random alpha: 0.5) ]).
22-
13+
layout: (BrEditorTextFlowLayout new lineSpacing: 10);
14+
constraintsDo: [ :c |
15+
c horizontal exact: 500.
16+
c vertical fitContent ];
17+
addChildren: (20
18+
timesCollect: [ BlElement new
19+
size: 75 @ 30;
20+
margin: (BlInsets all: 4);
21+
background: (Color random alpha: 0.5) ]).
22+
2323
^ anElement
2424
]
2525

2626
{ #category : #'examples - layout' }
2727
BrEditorTextFlowLayoutExamples >> container_extent [
2828
<gtExample>
29+
<return: #BlElement>
2930
| aContainer |
30-
3131
aContainer := self container.
3232
aContainer forceLayout.
33-
34-
self assert: aContainer extent equals: 500.0@182.0.
35-
33+
34+
self assert: aContainer extent equals: 500.0 @ 182.0.
35+
3636
^ aContainer
3737
]
3838

3939
{ #category : #'examples - layout' }
4040
BrEditorTextFlowLayoutExamples >> layout_no_memory_leak [
4141
<gtExample>
42+
<return: #BlElement>
4243
| aContainer |
43-
4444
aContainer := self container_extent.
45-
45+
4646
self assert: aContainer layout hasLines.
4747
self assert: aContainer layout hasElements.
4848
aContainer onRemovedFromSceneGraph.
4949
self assert: aContainer layout hasLines.
5050
self assert: aContainer layout hasElements not.
51-
51+
5252
^ aContainer
5353
]

0 commit comments

Comments
 (0)
0