1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
|
import * as os from "os";
import * as path from "path";
import * as fs from "fs";
import * as vscode from "vscode";
import { extensionContext, ideProtocolClient } from "./activation/activate";
interface DiffInfo {
originalFilepath: string;
newFilepath: string;
editor?: vscode.TextEditor;
step_index: number;
}
export const DIFF_DIRECTORY = path.join(os.homedir(), ".continue", "diffs");
class DiffManager {
// Create a temporary file in the global .continue directory which displays the updated version
// Doing this because virtual files are read-only
private diffs: Map<string, DiffInfo> = new Map();
private setupDirectory() {
// Make sure the diff directory exists
if (!fs.existsSync(DIFF_DIRECTORY)) {
fs.mkdirSync(DIFF_DIRECTORY, {
recursive: true,
});
}
}
constructor() {
this.setupDirectory();
}
private escapeFilepath(filepath: string): string {
return filepath.replace(/\\/g, "_").replace(/\//g, "_");
}
private openDiffEditor(
originalFilepath: string,
newFilepath: string
): vscode.TextEditor | undefined {
// If the file doesn't yet exist or the basename is a single digit number (git hash object or something), don't open the diff editor
if (
!fs.existsSync(newFilepath) ||
path.basename(originalFilepath).match(/^\d$/)
) {
return undefined;
}
const rightUri = vscode.Uri.parse(newFilepath);
const leftUri = vscode.Uri.file(originalFilepath);
const title = "Continue Diff";
console.log(
"Opening diff window with ",
leftUri,
rightUri,
title,
newFilepath,
originalFilepath
);
vscode.commands.executeCommand("vscode.diff", leftUri, rightUri, title);
const editor = vscode.window.activeTextEditor;
if (!editor) {
throw new Error("No active text editor found for Continue Diff");
}
// Change the vscode setting to allow codeLens in diff editor
vscode.workspace
.getConfiguration("diffEditor", editor.document.uri)
.update("codeLens", true, vscode.ConfigurationTarget.Global);
if (
extensionContext?.globalState.get<boolean>(
"continue.showDiffInfoMessage"
) !== false
) {
vscode.window
.showInformationMessage(
"Accept (⌘⇧↩) or reject (⌘⇧⌫) at the top of the file.",
"Got it",
"Don't show again"
)
.then((selection) => {
if (selection === "Don't show again") {
// Get the global state
extensionContext?.globalState.update(
"continue.showDiffInfoMessage",
false
);
}
});
}
return editor;
}
writeDiff(
originalFilepath: string,
newContent: string,
step_index: number
): string {
this.setupDirectory();
// Create or update existing diff
const newFilepath = path.join(
DIFF_DIRECTORY,
this.escapeFilepath(originalFilepath)
);
fs.writeFileSync(newFilepath, newContent);
// Open the diff editor if this is a new diff
if (!this.diffs.has(newFilepath)) {
const diffInfo: DiffInfo = {
originalFilepath,
newFilepath,
step_index,
};
this.diffs.set(newFilepath, diffInfo);
}
// Open the editor if it hasn't been opened yet
const diffInfo = this.diffs.get(newFilepath);
if (diffInfo && !diffInfo?.editor) {
diffInfo.editor = this.openDiffEditor(originalFilepath, newFilepath);
this.diffs.set(newFilepath, diffInfo);
}
return newFilepath;
}
cleanUpDiff(diffInfo: DiffInfo) {
// Close the editor, remove the record, delete the file
if (diffInfo.editor) {
vscode.window.showTextDocument(diffInfo.editor.document);
vscode.commands.executeCommand("workbench.action.closeActiveEditor");
}
this.diffs.delete(diffInfo.newFilepath);
fs.unlinkSync(diffInfo.newFilepath);
}
acceptDiff(newFilepath?: string) {
// If no newFilepath is provided and there is only one in the dictionary, use that
if (!newFilepath && this.diffs.size === 1) {
newFilepath = Array.from(this.diffs.keys())[0];
}
if (!newFilepath) {
console.log("No newFilepath provided to accept the diff");
return;
}
// Get the diff info, copy new file to original, then delete from record and close the corresponding editor
const diffInfo = this.diffs.get(newFilepath);
if (!diffInfo) {
console.log("No corresponding diffInfo found for newFilepath");
return;
}
// Save the right-side file, then copy over to original
vscode.workspace.textDocuments
.find((doc) => doc.uri.fsPath === newFilepath)
?.save()
.then(() => {
fs.writeFileSync(
diffInfo.originalFilepath,
fs.readFileSync(diffInfo.newFilepath)
);
this.cleanUpDiff(diffInfo);
});
}
rejectDiff(newFilepath?: string) {
// If no newFilepath is provided and there is only one in the dictionary, use that
if (!newFilepath && this.diffs.size === 1) {
newFilepath = Array.from(this.diffs.keys())[0];
}
if (!newFilepath) {
console.log(
"No newFilepath provided to reject the diff, diffs.size was",
this.diffs.size
);
return;
}
const diffInfo = this.diffs.get(newFilepath);
if (!diffInfo) {
console.log("No corresponding diffInfo found for newFilepath");
return;
}
// Stop the step at step_index in case it is still streaming
ideProtocolClient.deleteAtIndex(diffInfo.step_index);
vscode.workspace.textDocuments
.find((doc) => doc.uri.fsPath === newFilepath)
?.save()
.then(() => {
this.cleanUpDiff(diffInfo);
});
}
}
export const diffManager = new DiffManager();
export async function acceptDiffCommand(newFilepath?: string) {
diffManager.acceptDiff(newFilepath);
ideProtocolClient.sendAcceptRejectDiff(true);
}
export async function rejectDiffCommand(newFilepath?: string) {
diffManager.rejectDiff(newFilepath);
ideProtocolClient.sendAcceptRejectDiff(false);
}
|
