undo ls on file

ethanndickson · ethanndickson · commit 24a7053e5402 · 2025-03-03T02:30:50.000Z
diff --git a/agent/ls.go b/agent/ls.go
@@ -75,7 +75,6 @@ func listFiles(query LSRequest) (LSResponse, error) {
 	if err != nil {
 		return LSResponse{}, xerrors.Errorf("failed to get absolute path of %q: %w", fullPathRelative, err)
 	}
-	absolutePath := pathToArray(absolutePathString)
 
 	f, err := os.Open(absolutePathString)
 	if err != nil {
@@ -89,18 +88,7 @@ func listFiles(query LSRequest) (LSResponse, error) {
 	}
 
 	if !stat.IsDir() {
-		// `ls` on a file should return just that file.
-		return LSResponse{
-			AbsolutePath:       absolutePath,
-			AbsolutePathString: absolutePathString,
-			Contents: []LSFile{
-				{
-					Name:               filepath.Base(f.Name()),
-					AbsolutePathString: absolutePathString,
-					IsDir:              false,
-				},
-			},
-		}, nil
+		return LSResponse{}, xerrors.Errorf("path %q is not a directory", absolutePathString)
 	}
 
 	// `contents` may be partially populated even if the operation fails midway.
@@ -114,6 +102,8 @@ func listFiles(query LSRequest) (LSResponse, error) {
 		})
 	}
 
+	absolutePath := pathToArray(absolutePathString)
+
 	return LSResponse{
 		AbsolutePath:       absolutePath,
 		AbsolutePathString: absolutePathString,
diff --git a/agent/ls_internal_test.go b/agent/ls_internal_test.go
@@ -66,16 +66,8 @@ func TestListFilesNotADirectory(t *testing.T) {
 		Path:       pathToArray(rel),
 		Relativity: LSRelativityHome,
 	}
-	resp, err := listFiles(query)
-	require.NoError(t, err)
-	require.Equal(t, filePath, resp.AbsolutePathString)
-	require.ElementsMatch(t, []LSFile{
-		{
-			Name:               "file.txt",
-			AbsolutePathString: filePath,
-			IsDir:              false,
-		},
-	}, resp.Contents)
+	_, err = listFiles(query)
+	require.ErrorContains(t, err, "is not a directory")
 }
 
 func TestListFilesSuccess(t *testing.T) {
