NotificationsYou must be signed in to change notification settings
Fork906
Star10k

Commit998724d

authored

chore: sort agent/list-directory output (#17218)

This sorts the `contents` list alphabetically, but with directories before everything else.This is purely for UX on the Coder Desktop side, where the user only really cares about directories, and files are just for providing context in the file picker.

1 parent5979c32 commit998724dCopy full SHA for 998724d

File tree

2 files changed

+18

-5

lines changed

agent
- ls.go
- ls_internal_test.go

2 files changed

+18

-5

lines changed

`‎agent/ls.go`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`	`"path/filepath"`
`8`	`8`	`"regexp"`
`9`	`9`	`"runtime"`
	`10`	`+"slices"`
`10`	`11`	`"strings"`
`11`	`12`
`12`	`13`	`"github.com/shirou/gopsutil/v4/disk"`
`@@ -103,6 +104,17 @@ func listFiles(query LSRequest) (LSResponse, error) {`
`103`	`104`	`})`
`104`	`105`	`}`
`105`	`106`
	`107`	`+// Sort alphabetically: directories then files`
	`108`	`+slices.SortFunc(respContents,func(a,bLSFile)int {`
	`109`	`+ifa.IsDir&&!b.IsDir {`
	`110`	`+return-1`
	`111`	`+}`
	`112`	`+if!a.IsDir&&b.IsDir {`
	`113`	`+return1`
	`114`	`+}`
	`115`	`+returnstrings.Compare(a.Name,b.Name)`
	`116`	`+})`
	`117`	`+`
`106`	`118`	`absolutePath:=pathToArray(absolutePathString)`
`107`	`119`
`108`	`120`	`returnLSResponse{`

`‎agent/ls_internal_test.go`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -137,15 +137,16 @@ func TestListFilesSuccess(t *testing.T) {`
`137`	`137`	`require.NoError(t,err)`
`138`	`138`
`139`	`139`	`require.Equal(t,tmpDir,resp.AbsolutePathString)`
`140`		`-require.ElementsMatch(t, []LSFile{`
	`140`	`+// Output is sorted`
	`141`	`+require.Equal(t, []LSFile{`
`141`	`142`	`{`
`142`		`-Name:"repos",`
`143`		`-AbsolutePathString:reposDir,`
	`143`	`+Name:"Downloads",`
	`144`	`+AbsolutePathString:downloadsDir,`
`144`	`145`	`IsDir:true,`
`145`	`146`	`},`
`146`	`147`	`{`
`147`		`-Name:"Downloads",`
`148`		`-AbsolutePathString:downloadsDir,`
	`148`	`+Name:"repos",`
	`149`	`+AbsolutePathString:reposDir,`
`149`	`150`	`IsDir:true,`
`150`	`151`	`},`
`151`	`152`	`{`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit998724d

File tree

2 files changed

2 files changed

`‎agent/ls.go`

`‎agent/ls_internal_test.go`

0 commit comments