Skip to content

Overwrite from Server command should always replace the entire class text #1759

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
Apr 14, 2026
+15 −5
Merged

Overwrite from Server command should always replace the entire class text #1759

Show file tree
Hide file tree
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
14 changes: 12 additions & 2 deletions src/commands/compile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,16 @@ function updateOthers(others: string[], baseUri: vscode.Uri) {
});
}

export async function loadChanges(files: (CurrentTextFile | CurrentBinaryFile)[]): Promise<any> {
/**
* Pull changes due to save/compile from server and write them into the local file.
* Also used to refresh the local copy from the server outside of the save/compile workflow.
* Pass `forceRefreshClasses` to replace the entire text of classes regardless of the
* value of the `objectscript.refreshClassesOnSync` setting.
*/
export async function loadChanges(
files: (CurrentTextFile | CurrentBinaryFile)[],
forceRefreshClasses = false
): Promise<any> {
if (!files.length) {
return;
}
Expand All @@ -236,7 +245,8 @@ export async function loadChanges(files: (CurrentTextFile | CurrentBinaryFile)[]
if (
!(
isClass(file.uri.path) &&
!vscode.workspace.getConfiguration("objectscript", file.uri).get("refreshClassesOnSync")
!vscode.workspace.getConfiguration("objectscript", file.uri).get("refreshClassesOnSync") &&
!forceRefreshClasses
)
) {
content = (await api.getDoc(file.name, file.uri)).result.content;
Expand Down
2 changes: 1 addition & 1 deletion src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
const file = currentFile();
if (!file) return;
try {
await loadChanges([file]);
await loadChanges([file], true);
} catch (error) {
handleError(
error,
Expand Down
4 changes: 2 additions & 2 deletions src/providers/LowCodeEditorProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ export class LowCodeEditorProvider implements vscode.CustomTextEditorProvider {
});
} else if (isClientSide) {
// Load changes
loadChanges([file]);
loadChanges([file], true);
}
return;
case "compiled":
Expand All @@ -253,7 +253,7 @@ export class LowCodeEditorProvider implements vscode.CustomTextEditorProvider {
vscode.commands.executeCommand("workbench.action.files.revert");
}
// Load changes
if (isClientSide) loadChanges([file]);
if (isClientSide) loadChanges([file], true);
return;
case "userAction": {
// Process the source control user action
Expand Down
Loading