Skip to content

fix: Ajust project.ts #122

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
ricxJr merged 2 commits into from
May 8, 2026
Merged

fix: Ajust project.ts #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5698aa3
fix: Ajust project.ts
ricxJr May 8, 2026
cb8118d
fix: ajustment lint
ricxJr May 8, 2026
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
1 change: 0 additions & 1 deletion src/commands/compile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ export async function waitForCompileToFinish(document: vscode.TextDocument, time
});
}


/**
* For files being locally edited, get and return its mtime timestamp from workspace-state cache if present there,
* else get from server. May update cache.
Expand Down
70 changes: 34 additions & 36 deletions src/commands/project.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ export async function createProject(node: NodeBase | undefined, api?: AtelierAPI

export async function deleteProject(node: ProjectNode | undefined): Promise<any> {
let api: AtelierAPI;
let project: string;
let project: string | undefined;
if (node instanceof ProjectNode) {
api = new AtelierAPI(node.wsFolder.uri);
if (node.namespace) api.setNamespace(node.namespace);
Expand Down Expand Up @@ -373,7 +373,7 @@ function sodItemToPickAdditionsItem(
delim = "/";
}
result.fullName = parent + delim + item.Name;
result.label = " ".repeat(parentPad + 2) + result.label;
result.label = " ".repeat((parentPad ?? 0) + 2) + result.label;
result.description = result.fullName;
}
if (item.Type && (item.Type == 9 || item.Type == 10)) {
Expand Down Expand Up @@ -543,24 +543,22 @@ async function pickAdditions(
"(pil.Type = 'CLS' AND ?||sod.Name = pil.Name||'.cls') WHERE pil.ID IS NULL";
}
}
if (Array.isArray(tmpParams)) {
return api
.actionQuery(tmpQuery, tmpParams)
.then((data) => {
const insertItems: PickAdditionsItem[] = data.result.content.map((i) =>
sodItemToPickAdditionsItem(i, item.fullName, item.label.search(/\S/))
);
const newItems = [...quickPick.items];
newItems.splice(itemIdx + 1, 0, ...insertItems);
quickPick.items = newItems;
quickPick.selectedItems = selected;
quickPick.busy = false;
})
.catch((error) => {
quickPick.hide();
handleError(error, "Failed to get namespace contents.");
});
}
return api
.actionQuery(tmpQuery, tmpParams)
.then((data) => {
const insertItems: PickAdditionsItem[] = data.result.content.map((i) =>
sodItemToPickAdditionsItem(i, item.fullName, item.label.search(/\S/))
);
const newItems = [...quickPick.items];
newItems.splice(itemIdx + 1, 0, ...insertItems);
quickPick.items = newItems;
quickPick.selectedItems = selected;
quickPick.busy = false;
})
.catch((error) => {
quickPick.hide();
handleError(error, "Failed to get namespace contents.");
});
};

quickPick.onDidChangeSelection((items) => {
Expand All @@ -572,8 +570,8 @@ async function pickAdditions(
quickPick.busy = true;
// Change value of correct parameter in array
if (button.tooltip == "System") {
sys = button.toggle.checked ? "1" : "0";
if (["RTN", "INC", "OTH"].includes(category)) {
sys = button.toggle?.checked ? "1" : "0";
if (category !== undefined && ["RTN", "INC", "OTH"].includes(category)) {
parameters[0] = sys;
} else if (category != undefined) {
parameters[1] = sys;
Expand All @@ -582,8 +580,8 @@ async function pickAdditions(
parameters[4] = sys;
}
} else {
gen = button.toggle.checked ? "1" : "0";
if (["RTN", "INC", "OTH"].includes(category)) {
gen = button.toggle?.checked ? "1" : "0";
if (category !== undefined && ["RTN", "INC", "OTH"].includes(category)) {
parameters[1] = gen;
} else if (category != undefined) {
parameters[2] = gen;
Expand All @@ -598,7 +596,7 @@ async function pickAdditions(
quickPick.onDidTriggerItemButton((event) => {
quickPick.busy = true;
const itemIdx = quickPick.items.findIndex((i) => i.fullName === event.item.fullName);
if (event.button.tooltip.charAt(0) == "E") {
if ((event.button.tooltip ?? "").charAt(0) == "E") {
// Expand this item
expandItem(itemIdx);
} else {
Expand Down Expand Up @@ -627,8 +625,8 @@ async function pickAdditions(
);
if (
itemIdx != -1 &&
quickPick.items[itemIdx].buttons.length &&
quickPick.items[itemIdx].buttons[0].tooltip.charAt(0) == "E"
quickPick.items[itemIdx].buttons?.length &&
(quickPick.items[itemIdx].buttons?.[0].tooltip ?? "").charAt(0) == "E"
) {
// Expand this item
quickPick.busy = true;
Expand Down Expand Up @@ -673,15 +671,15 @@ export async function modifyProject(
for (const pick of picks) {
// Determine the type of this item
let type: string;
const ext: string = pick.split(".").pop().toLowerCase();
const ext: string = (pick.split(".").pop() ?? "").toLowerCase();
if (["mac", "int", "inc"].includes(ext)) {
type = "MAC";
} else if (ext == "cls") {
type = "CLS";
} else if (ext == "pkg") {
type = "PKG";
} else if (pick.includes("/")) {
if (pick.split("/").pop().includes(".")) {
if (pick.split("/").pop()?.includes(".")) {
type = "CSP";
} else {
type = "DIR";
Expand Down Expand Up @@ -780,7 +778,7 @@ export async function modifyProject(
// This is a file, so remove it
const fileName = isfsDocumentName(nodeOrUri);
let prjFileName = fileName.startsWith("/") ? fileName.slice(1) : fileName;
const ext = prjFileName.split(".").pop().toLowerCase();
const ext = (prjFileName.split(".").pop() ?? "").toLowerCase();
prjFileName = ext == "cls" ? prjFileName.slice(0, -4) : prjFileName;
const prjType = fileName.includes("/")
? "CSP"
Expand Down Expand Up @@ -929,7 +927,7 @@ export async function exportProjectContents(): Promise<any> {
export async function compileProjectContents(node: ProjectNode): Promise<any> {
const { wsFolder, namespace, label } = node;
const api = new AtelierAPI(wsFolder.uri);
api.setNamespace(namespace);
if (namespace) api.setNamespace(namespace);
const compileList: string[] = await api
.actionQuery(
"SELECT CASE WHEN Type = 'PKG' THEN Name||'.*.cls' WHEN Type = 'CLS' THEN Name||'.cls' ELSE Name END Name " +
Expand All @@ -954,7 +952,7 @@ export async function compileProjectContents(node: ProjectNode): Promise<any> {
throw new Error("Compile error");
}
})
.catch(() => compileErrorMsg())
.catch((error) => compileErrorMsg(error))
);
}

Expand Down Expand Up @@ -984,7 +982,7 @@ function isfsFolderForProject(project: string, api: AtelierAPI): number {
*/
export async function addIsfsFileToProject(project: string, fileName: string, api: AtelierAPI): Promise<void> {
let prjFileName = fileName.startsWith("/") ? fileName.slice(1) : fileName;
const ext = prjFileName.split(".").pop().toLowerCase();
const ext = (prjFileName.split(".").pop() ?? "").toLowerCase();
prjFileName = ext == "cls" ? prjFileName.slice(0, -4) : prjFileName;
const prjType = fileName.includes("/")
? "CSP"
Expand Down Expand Up @@ -1063,10 +1061,10 @@ export function addWorkspaceFolderForProject(node: ProjectNode): void {

async function handleCommandArg(
nodeOrUri: NodeBase | vscode.Uri | undefined
): Promise<{ node: NodeBase; api: AtelierAPI; project: string } | undefined> {
let node: NodeBase;
): Promise<{ node: NodeBase | undefined; api: AtelierAPI; project: string } | undefined> {
let node: NodeBase | undefined;
let api: AtelierAPI;
let project: string;
let project: string | undefined;
if (nodeOrUri instanceof NodeBase) {
// Called from Projects Explorer
node = nodeOrUri;
Expand Down
Loading