Skip to content

Commit b8091db

Browse files
committed
fix(server): stabilize workspace Git discovery locale
1 parent 70fc957 commit b8091db

2 files changed

Lines changed: 50 additions & 0 deletions

File tree

‎apps/server/src/project/CodeWorkspaceLoader.test.ts‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import * as Effect from "effect/Effect";
44
import * as FileSystem from "effect/FileSystem";
55
import * as Layer from "effect/Layer";
66
import * as Path from "effect/Path";
7+
import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";
78

89
import * as ProcessRunner from "../processRunner.ts";
910
import * as CodeWorkspaceLoader from "./CodeWorkspaceLoader.ts";
@@ -110,6 +111,54 @@ it.layer(layer)("CodeWorkspaceLoader", (it) => {
110111
}),
111112
);
112113

114+
it.effect.each([
115+
["fatal: not a git repository (or any of the parent directories): .git", true],
116+
["fatal: cannot open .git/config: Permission denied", false],
117+
["fatal: bad config line 1 in file .git/config", false],
118+
] as const)("handles Git discovery failure: %s", ([stderr, isNonGit]) =>
119+
Effect.gen(function* () {
120+
const f = yield* fixture();
121+
const filePath = f.path.join(f.plain, "localized.code-workspace");
122+
yield* f.fs.makeDirectory(f.path.join(f.plain, "folder"));
123+
yield* f.fs.writeFileString(filePath, '{"folders": [{"path": "folder"}]}');
124+
const calls: ProcessRunner.ProcessRunInput[] = [];
125+
const mockProcesses = Layer.succeed(ProcessRunner.ProcessRunner, {
126+
run: (input) => {
127+
calls.push(input);
128+
return Effect.succeed({
129+
stdout: "",
130+
stderr:
131+
input.env?.LC_ALL === "C"
132+
? stderr
133+
: "fatal : ni ceci ni aucun de ses répertoires parents n'est un dépôt git : .git",
134+
code: ChildProcessSpawner.ExitCode(128),
135+
timedOut: false,
136+
stdoutTruncated: false,
137+
stderrTruncated: false,
138+
stdoutInvalidUtf8: false,
139+
stderrInvalidUtf8: false,
140+
});
141+
},
142+
});
143+
yield* Effect.gen(function* () {
144+
const loader = yield* CodeWorkspaceLoader.CodeWorkspaceLoader;
145+
if (isNonGit) {
146+
const loaded = yield* loader.load(filePath);
147+
expect(loaded.workspaceRoot).toBe(f.plain);
148+
expect(loaded.workspace.repositories).toEqual([]);
149+
expect(loaded.workspace.folders[0]?.path).toBe(f.path.join(f.plain, "folder"));
150+
expect(calls).toHaveLength(2);
151+
} else {
152+
const error = yield* loader.load(filePath).pipe(Effect.flip);
153+
expect(error.reason).toBe("git");
154+
}
155+
}).pipe(
156+
Effect.provide(Layer.fresh(CodeWorkspaceLoader.layer).pipe(Layer.provide(mockProcesses))),
157+
);
158+
expect(calls.every((input) => input.env?.LC_ALL === "C")).toBe(true);
159+
}),
160+
);
161+
113162
it.effect.each([
114163
['{"folders": [}', "malformed"],
115164
['{"folders": []} /* unterminated', "malformed"],

‎apps/server/src/project/CodeWorkspaceLoader.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ const make = Effect.gen(function* () {
165165
.run({
166166
command: "git",
167167
args: ["-C", cwd, "rev-parse", "--show-toplevel"],
168+
env: { LC_ALL: "C" },
168169
timeout: "10 seconds",
169170
})
170171
.pipe(

0 commit comments

Comments
 (0)