@@ -18,7 +18,7 @@ import (
1818func (* agent )HandleLS (rw http.ResponseWriter ,r * http.Request ) {
1919ctx := r .Context ()
2020
21- var query LSQuery
21+ var query LSRequest
2222if ! httpapi .Read (ctx ,rw ,r ,& query ) {
2323return
2424}
@@ -45,7 +45,7 @@ func (*agent) HandleLS(rw http.ResponseWriter, r *http.Request) {
4545httpapi .Write (ctx ,rw ,http .StatusOK ,resp )
4646}
4747
48- func listFiles (query LSQuery ) (LSResponse ,error ) {
48+ func listFiles (query LSRequest ) (LSResponse ,error ) {
4949var fullPath []string
5050switch query .Relativity {
5151case LSRelativityHome :
@@ -67,28 +67,29 @@ func listFiles(query LSQuery) (LSResponse, error) {
6767}
6868
6969fullPath = append (fullPath ,query .Path ... )
70- absolutePathString ,err := filepath .Abs (filepath .Join (fullPath ... ))
70+ fullPathRelative := filepath .Join (fullPath ... )
71+ absolutePathString ,err := filepath .Abs (fullPathRelative )
7172if err != nil {
72- return LSResponse {},xerrors .Errorf ("failed to get absolute path: %w" ,err )
73+ return LSResponse {},xerrors .Errorf ("failed to get absolute path of %q : %w" , fullPathRelative ,err )
7374}
7475
7576f ,err := os .Open (absolutePathString )
7677if err != nil {
77- return LSResponse {},xerrors .Errorf ("failed to open directory: %w" ,err )
78+ return LSResponse {},xerrors .Errorf ("failed to open directory %q : %w" , absolutePathString ,err )
7879}
7980defer f .Close ()
8081
8182stat ,err := f .Stat ()
8283if err != nil {
83- return LSResponse {},xerrors .Errorf ("failed to stat directory: %w" ,err )
84+ return LSResponse {},xerrors .Errorf ("failed to stat directory %q : %w" , absolutePathString ,err )
8485}
8586
8687if ! stat .IsDir () {
87- return LSResponse {},xerrors .New ("path is not a directory" )
88+ return LSResponse {},xerrors .Errorf ("path%q is not a directory" , absolutePathString )
8889}
8990
9091// `contents` may be partially populated even if the operation fails midway.
91- contents ,_ := f .Readdir (- 1 )
92+ contents ,_ := f .ReadDir (- 1 )
9293respContents := make ([]LSFile ,0 ,len (contents ))
9394for _ ,file := range contents {
9495respContents = append (respContents ,LSFile {
@@ -140,7 +141,7 @@ func pathToArray(path string) []string {
140141return out
141142}
142143
143- type LSQuery struct {
144+ type LSRequest struct {
144145// e.g. [], ["repos", "coder"],
145146Path []string `json:"path"`
146147// Whether the supplied path is relative to the user's home directory,