Commit369852c

committed

undo ls on file

1 parentb1e414f commit369852cCopy full SHA for 369852c

File tree

-23

lines changed

-23

lines changed

Lines changed: 3 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,6 @@ func listFiles(query LSRequest) (LSResponse, error) {`
`75`	`75`	`iferr!=nil {`
`76`	`76`	`returnLSResponse{},xerrors.Errorf("failed to get absolute path of %q: %w",fullPathRelative,err)`
`77`	`77`	`}`
`78`		`-absolutePath:=pathToArray(absolutePathString)`
`79`	`78`
`80`	`79`	`f,err:=os.Open(absolutePathString)`
`81`	`80`	`iferr!=nil {`
`@@ -89,18 +88,7 @@ func listFiles(query LSRequest) (LSResponse, error) {`
`89`	`88`	`}`
`90`	`89`
`91`	`90`	`if!stat.IsDir() {`
`92`		-// `ls` on a file should return just that file.
`93`		`-returnLSResponse{`
`94`		`-AbsolutePath:absolutePath,`
`95`		`-AbsolutePathString:absolutePathString,`
`96`		`-Contents: []LSFile{`
`97`		`-{`
`98`		`-Name:filepath.Base(f.Name()),`
`99`		`-AbsolutePathString:absolutePathString,`
`100`		`-IsDir:false,`
`101`		`-},`
`102`		`-},`
`103`		`-},nil`
	`91`	`+returnLSResponse{},xerrors.Errorf("path %q is not a directory",absolutePathString)`
`104`	`92`	`}`
`105`	`93`
`106`	`94`	// `contents` may be partially populated even if the operation fails midway.
`@@ -114,6 +102,8 @@ func listFiles(query LSRequest) (LSResponse, error) {`
`114`	`102`	`})`
`115`	`103`	`}`
`116`	`104`
	`105`	`+absolutePath:=pathToArray(absolutePathString)`
	`106`	`+`
`117`	`107`	`returnLSResponse{`
`118`	`108`	`AbsolutePath:absolutePath,`
`119`	`109`	`AbsolutePathString:absolutePathString,`

Lines changed: 2 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,16 +66,8 @@ func TestListFilesNotADirectory(t *testing.T) {`
`66`	`66`	`Path:pathToArray(rel),`
`67`	`67`	`Relativity:LSRelativityHome,`
`68`	`68`	`}`
`69`		`-resp,err:=listFiles(query)`
`70`		`-require.NoError(t,err)`
`71`		`-require.Equal(t,filePath,resp.AbsolutePathString)`
`72`		`-require.ElementsMatch(t, []LSFile{`
`73`		`-{`
`74`		`-Name:"file.txt",`
`75`		`-AbsolutePathString:filePath,`
`76`		`-IsDir:false,`
`77`		`-},`
`78`		`-},resp.Contents)`
	`69`	`+_,err=listFiles(query)`
	`70`	`+require.ErrorContains(t,err,"is not a directory")`
`79`	`71`	`}`
`80`	`72`
`81`	`73`	`funcTestListFilesSuccess(t*testing.T) {`

Comments

(0)