Skip to content

Update text of all local files changed by compilation #1538

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 1 commit into from
Apr 25, 2025
Merged

Update text of all local files changed by compilation #1538

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
32 changes: 22 additions & 10 deletions src/commands/compile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import {
} from "../utils";
import { StudioActions } from "./studio";
import { NodeBase, PackageNode, RootNode } from "../explorer/nodes";
import { updateIndexForDocument } from "../utils/documentIndex";
import { getUrisForDocument, updateIndexForDocument } from "../utils/documentIndex";

async function compileFlags(): Promise<string> {
const defaultFlags = config().compileFlags;
Expand Down Expand Up @@ -249,12 +249,11 @@ export async function loadChanges(files: (CurrentTextFile | CurrentBinaryFile)[]
}

export async function compile(docs: CurrentFile[], flags?: string): Promise<any> {
const conf = vscode.workspace.getConfiguration(
"objectscript",
vscode.workspace.getWorkspaceFolder(docs[0].uri) || docs[0].uri
);
const wsFolder = vscode.workspace.getWorkspaceFolder(docs[0].uri);
const conf = vscode.workspace.getConfiguration("objectscript", wsFolder || docs[0].uri);
flags = flags || conf.get("compileFlags");
const api = new AtelierAPI(docs[0].uri);
const docNames = docs.map((d) => d.name);
return vscode.window
.withProgress(
{
Expand All @@ -264,18 +263,31 @@ export async function compile(docs: CurrentFile[], flags?: string): Promise<any>
},
(progress, token: vscode.CancellationToken) =>
api
.asyncCompile(
docs.map((el) => el.name),
token,
flags
)
.asyncCompile(docNames, token, flags)
.then((data) => {
const info = docs.length > 1 ? "" : `${docs[0].name}: `;
if (data.status && data.status.errors && data.status.errors.length) {
throw new Error(`${info}Compile error`);
} else if (!conf.get("suppressCompileMessages")) {
vscode.window.showInformationMessage(`${info}Compilation succeeded.`, "Dismiss");
}
if (wsFolder) {
// Make sure that we update the content for any
// other documents affected by this compilation
data.result.content.forEach((f) => {
if (docNames.includes(f.name)) return;
getUrisForDocument(f.name, wsFolder).forEach((u) => {
docs.push({
name: f.name,
uri: u,
uniqueId: `${wsFolder.name}:${f.name}`,
// These two keys aren't used by loadChanges()
workspaceFolder: wsFolder.name,
fileName: u.fsPath,
});
});
});
}
return docs;
})
.catch(() => {
Expand Down