Skip to content

Commit c3bbd11

Browse files
committed
Respect original EndOfLine in file, while load changes from server
1 parent 7cf800a commit c3bbd11

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/commands/compile.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ async function loadChanges(files: CurrentFile[]): Promise<any> {
4848
api
4949
.getDoc(file.name)
5050
.then(data => {
51-
const content = (data.result.content || []).join("\n");
51+
const content = (data.result.content || []).join(file.eol === vscode.EndOfLine.LF ? "\n" : "\r\n");
5252
if (file.uri.scheme === "file") {
5353
fs.writeFileSync(file.fileName, content);
5454
} else if (file.uri.scheme === FILESYSTEM_SCHEMA) {

src/utils/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ export interface CurrentFile {
1919
fileName: string;
2020
content: string;
2121
uri: vscode.Uri;
22+
eol: vscode.EndOfLine;
2223
}
2324

2425
export function currentFile(document?: vscode.TextDocument): CurrentFile {
@@ -36,6 +37,7 @@ export function currentFile(document?: vscode.TextDocument): CurrentFile {
3637
) {
3738
return null;
3839
}
40+
const eol = document.eol || vscode.EndOfLine.LF;
3941
const uri = document.uri;
4042
const fileName = document.fileName;
4143
const content = document.getText();
@@ -72,6 +74,7 @@ export function currentFile(document?: vscode.TextDocument): CurrentFile {
7274
fileName,
7375
name,
7476
uri,
77+
eol,
7578
};
7679
}
7780

0 commit comments

Comments
 (0)