Move edit length check above file open

code-asher · code-asher · commit c63c4a9dc8b7 · 2025-09-11T15:25:12.000-08:00
diff --git a/agent/files.go b/agent/files.go
@@ -208,6 +208,10 @@ func (a *agent) editFile(path string, edits []workspacesdk.FileEdit) (int, error
 		return http.StatusBadRequest, xerrors.Errorf("file path must be absolute: %q", path)
 	}
 
+	if len(edits) == 0 {
+		return http.StatusBadRequest, xerrors.New("must specify at least one edit")
+	}
+
 	f, err := a.filesystem.Open(path)
 	if err != nil {
 		status := http.StatusInternalServerError
@@ -230,10 +234,6 @@ func (a *agent) editFile(path string, edits []workspacesdk.FileEdit) (int, error
 		return http.StatusBadRequest, xerrors.Errorf("open %s: not a file", path)
 	}
 
-	if len(edits) == 0 {
-		return http.StatusBadRequest, xerrors.New("must specify at least one edit")
-	}
-
 	transforms := make([]transform.Transformer, len(edits))
 	for i, edit := range edits {
 		transforms[i] = replace.String(edit.Search, edit.Replace)
diff --git a/agent/files_test.go b/agent/files_test.go
@@ -435,30 +435,48 @@ func TestEditFile(t *testing.T) {
 			error:   "file path must be absolute",
 		},
 		{
-			name:    "NonExistent",
-			path:    filepath.Join(tmpdir, "does-not-exist"),
+			name:     "NoEdits",
+			path:     filepath.Join(tmpdir, "no-edits"),
+			contents: "foo bar",
+			errCode:  http.StatusBadRequest,
+			error:    "must specify at least one edit",
+		},
+		{
+			name: "NonExistent",
+			path: filepath.Join(tmpdir, "does-not-exist"),
+			edits: []workspacesdk.FileEdit{
+				{
+					Search:  "foo",
+					Replace: "bar",
+				},
+			},
 			errCode: http.StatusNotFound,
 			error:   "file does not exist",
 		},
 		{
-			name:    "IsDir",
-			path:    dirPath,
+			name: "IsDir",
+			path: dirPath,
+			edits: []workspacesdk.FileEdit{
+				{
+					Search:  "foo",
+					Replace: "bar",
+				},
+			},
 			errCode: http.StatusBadRequest,
 			error:   "not a file",
 		},
 		{
-			name:    "NoPermissions",
-			path:    noPermsFilePath,
+			name: "NoPermissions",
+			path: noPermsFilePath,
+			edits: []workspacesdk.FileEdit{
+				{
+					Search:  "foo",
+					Replace: "bar",
+				},
+			},
 			errCode: http.StatusForbidden,
 			error:   "permission denied",
 		},
-		{
-			name:     "NoEdits",
-			path:     filepath.Join(tmpdir, "no-edits"),
-			contents: "foo bar",
-			errCode:  http.StatusBadRequest,
-			error:    "must specify at least one edit",
-		},
 		{
 			name:     "FailRename",
 			path:     failRenameFilePath,
