Skip to content

Commit

Permalink
restore guards against arrays in ListModel collection & install help
Browse files Browse the repository at this point in the history
The help package wasn't installed in the baseline. Fixed. 
There is a long-standing bug that ListModel's were getting Array's not OrderedCollection's. Restore guardrails until the source of that bug can be found. 
open debugger in morphic ui thread

#209
#174
  • Loading branch information
ericwinger committed Feb 6, 2025
1 parent 610f3f4 commit ec60c69
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
2 changes: 2 additions & 0 deletions BaselineOfJadeiteForPharo/BaselineOfJadeiteForPharo.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ BaselineOfJadeiteForPharo >> baseline: spec [
with: [ spec requires: 'Jadeite-Changes' ];
package: 'Jadeite-Connection'
with: [ spec requires: 'Jadeite-Debugger' ];
package: 'Jadeite-Help'
with: [ spec requires: 'Jadeite-Connection' ];
package: 'Jadeite-Tests'
with: [ spec requires: 'Jadeite-Connection' ].
spec
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,24 @@ RowanProcessServiceClient >> debugger [
{ #category : 'debugger' }
RowanProcessServiceClient >> openDebugger [

| activeProcess |
| activeProcess debuggerApplication |
activeProcess := Processor activeProcess.
debugger := JadeiteDebuggerApplication showOnSession:
GciSession current library.
debuggerApplication := JadeiteDebuggerApplication new gciSession:
GciSession current.
debuggerApplication gciSession library: GciSession current library.
debugger := debuggerApplication new: JadeiteDebuggerPresenter.
debugger
suspendedProcess: activeProcess;
gsProcess: self.
debugger
addStyle: 'jadeiteTextBackgroundColor';
gciSession: GciSession current.
debugger errorMessagePresenter text: errorMessage.
1 to: frames size do: [ :index |
(frames at: index) index: index
].
1 to: frames size do: [ :index | (frames at: index) index: index ].
debugger frameListPresenter items: frames.
debugger selectInitialFrame.
self class debuggedProcessServices add: self.
UIManager default defer: [ debugger open ].
activeProcess suspend.
^ debugger answer
]
Expand Down
10 changes: 2 additions & 8 deletions Jadeite-SupportClasses/ListModel.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,7 @@ ListModel >> reject: aBlock [
{ #category : 'removing' }
ListModel >> remove: anObject [

(collection isKindOf: Array) ifTrue: [self halt.
Transcript
cr;
show: 'ListModel list is an Array again. :(';
tab;
print: collection;
flush.
collection isArray ifTrue: [
collection := collection asOrderedCollection ]. "yuck - still can't find the source of these Arrays"
collection remove: anObject.
self announcer announce: (ValueChanged newValue: self)
Expand All @@ -136,7 +130,7 @@ ListModel >> remove: anObject ifAbsent: absentBlock [
{ #category : 'removing' }
ListModel >> removeAll [

(collection isKindOf: Array) ifTrue: [self halt.
collection isArray ifTrue: [
collection := collection asOrderedCollection "yuck - still can't find the source of these Arrays" ].
collection removeAll.
self refreshList.
Expand Down

0 comments on commit ec60c69

Please sign in to comment.