Merge pull request #748 from tomooda/747-Bookmarks-in-StFileSystemPre…

…senter-navigate-to-wrong-locations

sort subdirectories in the same order as the file tree table

src/NewTools-FileBrowser/StDirectoryTreePresenter.class.st

@@ -40,24 +40,30 @@ StDirectoryTreePresenter >> defaultOutputPort [
 ]
 
 { #category : 'accessing' }
-StDirectoryTreePresenter >> expandPath: aFileLocator [ 
+StDirectoryTreePresenter >> expandPath: aFileLocator [
 	"Expand the receiver's tree to aFileLocator reference"
-	
+
 	| path aPathForSpec currentNode |
-
 	path := aFileLocator asPath segments asOrderedCollection.
 	aPathForSpec := OrderedCollection new.
 	aPathForSpec add: 1.
-	
+
 	currentNode := directoryTreePresenter roots anyOne.
-
-	path do: [ :aPart | | found |
-		found := currentNode directories detect: [ :e | e basename = aPart ] ifNone: [ ^self ].
-		aPathForSpec add: (currentNode directories indexOf: found).
-		currentNode := found ].
 
-	directoryTreePresenter 
-		selectPath: aPathForSpec scrollToSelection: false
+	path do: [ :aPart |
+		| subdirs |
+		subdirs := currentNode directories sorted: [ :a :b |
+			           a basename caseInsensitiveLessOrEqual: b basename ].
+		currentNode := nil.
+		subdirs doWithIndex: [ :subdir :index |
+			(currentNode isNil and: [ subdir basename = aPart ]) ifTrue: [
+				currentNode := subdir.
+				aPathForSpec add: index ] ].
+		currentNode ifNil: [ ^ self ] ].
+
+	directoryTreePresenter
+		selectPath: aPathForSpec
+		scrollToSelection: false
 ]
 
 { #category : 'initialization' }