Skip to content

Fix issue where Undo after a save deletes the file being edited #1524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 4, 2025
Merged

Fix issue where Undo after a save deletes the file being edited #1524

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e60a6de
Fix issuse where Undo deletes the file
isc-bsaviano Apr 3, 2025
f0eb3af
CHANGELOG and README updates
isc-bsaviano Apr 3, 2025
69ad911
Merge remote-tracking branch 'upstream/master' into fix-1522
isc-bsaviano Apr 3, 2025
94d4a5d
Update CHANGELOG.md
isc-bsaviano Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/commands/compile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import {
notNull,
outputChannel,
RateLimiter,
replaceFile,
routineNameTypeRegex,
} from "../utils";
import { StudioActions } from "./studio";
Expand Down Expand Up @@ -228,12 +227,14 @@ export async function loadChanges(files: (CurrentTextFile | CurrentBinaryFile)[]
if (notIsfs(file.uri)) {
const content = await api.getDoc(file.name).then((data) => data.result.content);
exportedUris.add(file.uri.toString()); // Set optimistically
await replaceFile(file.uri, content).catch((e) => {
// Save failed, so remove this URI from the set
exportedUris.delete(file.uri.toString());
// Re-throw the error
throw e;
});
await vscode.workspace.fs
.writeFile(file.uri, Buffer.isBuffer(content) ? content : new TextEncoder().encode(content.join("\n")))
.then(undefined, (e) => {
// Save failed, so remove this URI from the set
exportedUris.delete(file.uri.toString());
// Re-throw the error
throw e;
});
if (isClassOrRtn(file.uri)) {
// Update the document index
updateIndexForDocument(file.uri, undefined, undefined, content);
Expand Down
13 changes: 11 additions & 2 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ import {
isClassOrRtn,
addWsServerRootFolderData,
getWsFolder,
replaceFile,
} from "./utils";
import { ObjectScriptDiagnosticProvider } from "./providers/ObjectScriptDiagnosticProvider";
import { DocumentLinkProvider } from "./providers/DocumentLinkProvider";
Expand Down Expand Up @@ -1272,7 +1271,17 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
// Generate the new content
const newContent = generateFileContent(uri, fileName, sourceContent);
// Write the new content to the file
return replaceFile(uri, newContent.content);
const wsEdit = new vscode.WorkspaceEdit();
wsEdit.replace(
uri,
new vscode.Range(0, 0, newContent.content.length + 1, 0),
newContent.content.join("\n"),
{
label: "ObjectScript autoAdjustName",
needsConfirmation: false,
}
);
await vscode.workspace.applyEdit(wsEdit);
})
);
}),
Expand Down