Skip to content
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.

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

Better handling of generated INT routines in project folders #1317

Merged
merged 1 commit into from
Feb 22, 2024
Merged
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion src/utils/FileProviderUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ export async function projectContentsFromUri(uri: vscode.Uri, overrideFlat?: boo
"(pil.Type = 'CLS' AND ?||sod.Name = pil.Name||'.cls') OR (pil.Type = 'PKG' AND ?||sod.Name = pil.Name) OR " +
"((pil.Type = 'CLS' OR pil.Type = 'PKG') AND pil.Name %STARTSWITH ?||sod.Name||'.') " +
"WHERE pil.Type = 'CLS' OR pil.Type = 'PKG' " +
"UNION SELECT CASE WHEN $LENGTH(SUBSTR(sod.Name,?),'.') > 2 THEN $PIECE(SUBSTR(sod.Name,?),'.') ELSE SUBSTR(sod.Name,?) END Name, pil.Type FROM " +
'UNION SELECT CASE WHEN ($LENGTH(SUBSTR(sod.Name,?),\'.\') > 2 AND NOT (SUBSTR(sod.Name,?) %PATTERN \'.E1"."0.1"G"1N1".int"\')) ' +
"THEN $PIECE(SUBSTR(sod.Name,?),'.') ELSE SUBSTR(sod.Name,?) END Name, pil.Type FROM " +
"%Library.RoutineMgr_StudioOpenDialog(?,1,1,1,1,0,1) AS sod JOIN %Studio.Project_ProjectItemsList(?) AS pil ON " +
"pil.Type = 'MAC' AND sod.Name = pil.Name " +
"UNION SELECT sod.Name, pil.Type FROM " +
Expand All @@ -65,6 +66,7 @@ export async function projectContentsFromUri(uri: vscode.Uri, overrideFlat?: boo
l,
l,
l,
l,
`${folderDots}*.${["mac", "int", "inc", "bas", "mvi"].join(`,${folderDots}*.`)}`,
project,
folder + "*",
Expand Down
Loading