8000 Revert "Move classifiers to separate package" · feenkcom/gt4pharo@fdc77b0 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Commit fdc77b0

Browse files
refactoringdrrefactoringdr
committed
Revert "Move classifiers to separate package"
This reverts commit d349deb.
1 parent 1168936 commit fdc77b0

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

‎src/BaselineOfGToolkit4Pharo/BaselineOfGToolkit4Pharo.class.st

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ BaselineOfGToolkit4Pharo >> baseline: spec [
6363

6464
package: 'GToolkit-Pharo-Coder-Method' with: [
6565
spec requires: #(
66-
'Brick-classifiers'
6766
'GToolkitCoder'
6867
'GToolkitCompleter'
6968
'GToolkitExamplesEngine'

‎src/GToolkit-Pharo-Coder-Examples/GtPharoSelecterExamples.class.st

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ GtPharoSelecterExamples >> editorOnCode [
4343

4444
anEditorElement := self editorFor: self exampleSmalltalkCode.
4545
anEditor := anEditorElement editor.
46-
anEditor doubleClickWordClassifier: SmalltalkWordClassifier new.
47-
anEditor movementWordClassifier: SmalltalkWordClassifier new.
46+
anEditor doubleClickWordClassifier: BrTextEditorModel smalltalkWordClassifier.
47+
anEditor movementWordClassifier: BrTextEditorModel smalltalkWordClassifier.
4848

4949
self assert: anEditor cursors isEmpty.
5050
self assert: anEditor selection isEmpty.
@@ -59,8 +59,8 @@ GtPharoSelecterExamples >> editorOnEmpty [
5959

6060
anEditorElement := self editorFor: ''.
6161
anEditor := anEditorElement editor.
62-
anEditor doubleClickWordClassifier: SmalltalkWordClassifier new.
63-
anEditor movementWordClassifier: SmalltalkWordClassifier new.
62+
anEditor doubleClickWordClassifier: BrTextEditorModel smalltalkWordClassifier.
63+
anEditor movementWordClassifier: BrTextEditorModel smalltalkWordClassifier.
6464

6565
self assert: anEditor cursors isEmpty.
6666
self assert: anEditor selection isEmpty.

‎src/GToolkit-Pharo-Coder-Method/GtSmalltalkSourceCoder.class.st

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,16 @@ GtSmalltalkSourceCoder class >> doubleClickClassifier: anObject [
2323

2424
{ #category : #initialization }
2525
GtSmalltalkSourceCoder class >> initialize [
26-
WordMovementClassifier := CamelCaseWordClassifier new.
27-
DoubleClickClassifier := SmalltalkWordClassifier new
26+
WordMovementClassifier := self smalltalkWordClassifier.
27+
DoubleClickClassifier := self smalltalkWordClassifier
28+
]
29+
30+
{ #category : #private }
31+
GtSmalltalkSourceCoder class >> smalltalkWordClassifier [
32+
^ [ :c1 :c2 |
33+
c1 isSeparator ~= c2 isSeparator
34+
or: [ ((c1 isAlphaNumeric | (c1 = $_)) not and: [ c2 isAlphaNumeric | (c2 = $_) ])
35+
or: [ c1 isAlphaNumeric | (c1 = $_) and: [ c2 tokenish not ] ] ] ]
2836
]
2937

3038
{ #category : #accessing }

0 commit comments

Comments
 (0)
0