diff options
Diffstat (limited to 'extension/src')
| -rw-r--r-- | extension/src/continueIdeClient.ts | 8 | ||||
| -rw-r--r-- | extension/src/diffs.ts | 2 | ||||
| -rw-r--r-- | extension/src/util/messenger.ts | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/extension/src/continueIdeClient.ts b/extension/src/continueIdeClient.ts index 4c1fdf1e..6dd117d3 100644 --- a/extension/src/continueIdeClient.ts +++ b/extension/src/continueIdeClient.ts @@ -386,8 +386,12 @@ class IdeProtocolClient { contents = editor.document.getText(); } }); - if (!contents) { - contents = fs.readFileSync(filepath, "utf-8"); + if (typeof contents === "undefined") { + if (fs.existsSync(filepath)) { + contents = fs.readFileSync(filepath, "utf-8"); + } else { + contents = ""; + } } return contents; } diff --git a/extension/src/diffs.ts b/extension/src/diffs.ts index 37943de4..d04f9bdb 100644 --- a/extension/src/diffs.ts +++ b/extension/src/diffs.ts @@ -129,7 +129,7 @@ class DiffManager { // Open the diff editor if this is a new diff if (!this.diffs.has(newFilepath)) { // Figure out the first line that is different - const oldContent = fs.readFileSync(originalFilepath).toString("utf-8"); + const oldContent = ideProtocolClient.readFile(originalFilepath); const line = this._findFirstDifferentLine(oldContent, newContent); const diffInfo: DiffInfo = { diff --git a/extension/src/util/messenger.ts b/extension/src/util/messenger.ts index 7fd71ddd..3044898e 100644 --- a/extension/src/util/messenger.ts +++ b/extension/src/util/messenger.ts @@ -15,7 +15,7 @@ export abstract class Messenger { abstract onOpen(callback: () => void): void; abstract onClose(callback: () => void): void; - + abstract onError(callback: () => void): void; abstract sendAndReceive(messageType: string, data: any): Promise<any>; |