andras/vault-link
1
0
Fork 0
Code Issues Pull requests 18 Projects Releases 55 Packages Wiki Activity Actions 1

Replace all instead of just replace

Browse source
This commit is contained in:
Andras Schmelczer 2025-11-22 19:57:52 +00:00
parent 9c3dedad76
commit f11c8db6d2
5 changed files with 29 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
frontend/sync-client/src/file-operations/file-operations.ts
View file

@ -114,14 +114,14 @@ export class FileOperations {
`Performing a 3-way merge for ${path} with the expected content`
);
text = text.replace(this.nativeLineEndings, "\n");
text = text.replaceAll(this.nativeLineEndings, "\n");
const merged = reconcile(
expectedText,
{ text, cursors },
newText
);
const resultText = merged.text.replace(
const resultText = merged.text.replaceAll(
"\n",
this.nativeLineEndings
);
@ -197,7 +197,7 @@ export class FileOperations {
const decoder = new TextDecoder("utf-8");
let text = decoder.decode(content);
text = text.replace(this.nativeLineEndings, "\n");
text = text.replaceAll(this.nativeLineEndings, "\n");
return new TextEncoder().encode(text);
}
@ -208,7 +208,7 @@ export class FileOperations {
const decoder = new TextDecoder("utf-8");
let text = decoder.decode(content);
text = text.replace("\n", this.nativeLineEndings);
text = text.replaceAll("\n", this.nativeLineEndings);
return new TextEncoder().encode(text);
}