diff --git a/src-gs/gtoolkit-remote.gs b/src-gs/gtoolkit-remote.gs index 41b8946f..9ba74a91 100644 --- a/src-gs/gtoolkit-remote.gs +++ b/src-gs/gtoolkit-remote.gs @@ -14769,15 +14769,17 @@ gtRawFor: aView category: '*GToolkit-RemotePhlow-GemStone' method: Object gtRemoteVariableValuePairsWithSelfIf: aBoolean - | instVarNames bindings indexedVarsSize | + | instVarNames bindings instanceVariables indexedVarsSize | instVarNames := self class allInstVarNames. indexedVarsSize := self basicSize - instVarNames size. bindings := OrderedCollection new: instVarNames size + 1. + instanceVariables := OrderedCollection new: instVarNames size + 1. aBoolean ifTrue: [ bindings add: 'self' -> self ]. instVarNames doWithIndex: [ :each :index | - bindings add: (each -> (self instVarAt: index))]. + instanceVariables add: (each -> (self instVarAt: index))]. + bindings addAll: (instanceVariables sort: [ :a :b | a key < b key ]). 1 to: (indexedVarsSize min: 21) do: [ :index | bindings add: (index asString -> (self _at: index)) ].