Skip to content

Update status of document after running server-side source control action on it when respectEditableStatus is set #1792

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
isc-bsaviano merged 1 commit into from
Jun 3, 2026
Merged

Update status of document after running server-side source control action on it when respectEditableStatus is set #1792

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 17 additions & 3 deletions src/commands/studio.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ export class StudioActions {
const actionToProcess: UserAction = data.result.content.pop();

if (actionToProcess.reload && !isPrj) {
await vscode.commands.executeCommand("workbench.action.files.revert", this.uri);
await vscode.commands.executeCommand("workbench.action.files.revert");
}

const attemptedEditLabel = getOtherStudioActionLabel(OtherStudioAction.AttemptedEdit);
Expand All @@ -364,7 +364,7 @@ export class StudioActions {
this.projectEditAnswer = "-1";
} else if (this.uri) {
// Only revert if we have a URI
await vscode.commands.executeCommand("workbench.action.files.revert", this.uri);
await vscode.commands.executeCommand("workbench.action.files.revert");
}
}
outputChannel.appendLine(actionToProcess.errorText);
Expand All @@ -376,7 +376,7 @@ export class StudioActions {
if (action.label === attemptedEditLabel) {
if (answer != "1" && this.uri) {
// Only revert if we have a URI
await vscode.commands.executeCommand("workbench.action.files.revert", this.uri);
await vscode.commands.executeCommand("workbench.action.files.revert");
}
if (isPrj) {
// Store the answer. No answer means "allow the edit".
Expand All @@ -388,6 +388,20 @@ export class StudioActions {
? this.userAction(action, true, answer.answer, answer.msg, type)
: this.userAction(action, true, answer, "", type);
}
} else if (action.id != "6" && !isPrj && this.uri) {
// This action was run on a document. If the user is respecting
// editable status force VS Code to check the status of the
// document in case it was changed by the action.
const activeDoc = vscode.window.activeTextEditor?.document;
if (
vscode.workspace
.getConfiguration("objectscript.serverSourceControl", this.uri)
?.get("respectEditableStatus") &&
activeDoc?.uri.toString() == this.uri.toString() &&
!activeDoc.isDirty
) {
vscode.commands.executeCommand("workbench.action.files.revert");
}
}
})
.then(() => resolve())
Expand Down