Skip to content

Allow symbols to be defined in free-format #434

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
worksofliam merged 1 commit into from
Jul 30, 2025
Merged

Allow symbols to be defined in free-format #434

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
62 changes: 29 additions & 33 deletions language/parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,51 +891,47 @@ export default class Parser {

case `DCL-S`:
if (parts.length > 1) {
if (currentItem === undefined) {
currentItem = new Declaration(`variable`);
currentItem.name = partsLower[1];
currentItem.keyword = Parser.expandKeywords(tokens.slice(2));
currentItem.tags = currentTags;
currentItem = new Declaration(`variable`);
currentItem.name = partsLower[1];
currentItem.keyword = Parser.expandKeywords(tokens.slice(2));
currentItem.tags = currentTags;

currentItem.position = {
path: fileUri,
range: tokens[1].range
};
currentItem.position = {
path: fileUri,
range: tokens[1].range
};

currentItem.range = {
start: currentStmtStart.line,
end: lineNumber
};
currentItem.range = {
start: currentStmtStart.line,
end: lineNumber
};

scope.addSymbol(currentItem);
resetDefinition = true;
}
scope.addSymbol(currentItem);
resetDefinition = true;
}
break;

case `DCL-ENUM`:
if (currentItem === undefined) {
if (parts.length > 1) {
currentItem = new Declaration(`constant`);
currentItem.name = partsLower[1];
currentItem.keyword = Parser.expandKeywords(tokens.slice(2));
if (parts.length > 1) {
currentItem = new Declaration(`constant`);
currentItem.name = partsLower[1];
currentItem.keyword = Parser.expandKeywords(tokens.slice(2));

currentItem.position = {
path: fileUri,
range: tokens[1].range
};
currentItem.position = {
path: fileUri,
range: tokens[1].range
};

currentItem.range = {
start: currentStmtStart.line,
end: currentStmtStart.line
};
currentItem.range = {
start: currentStmtStart.line,
end: currentStmtStart.line
};

currentItem.readParms = true;
currentItem.readParms = true;

currentGroup = `constants`;
currentGroup = `constants`;

currentDescription = [];
}
currentDescription = [];
}
break;

Expand Down
73 changes: 55 additions & 18 deletions tests/suite/basics.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1877,22 +1877,59 @@ test('correct ranges (#427)', async () => {
expect(constants[3].keyword[`CONST`]).toBe(`9`);
});

// test('scoobydo', async () => {
// const content = await getFileContent(path.join(__dirname, `..`, `rpgle`, `testing.rpgle`));
// const lines = content.split(/\r?\n/);
// const cache = await parser.getDocs(uri, content, { ignoreCache: true, withIncludes: false });
test('that symbols can be defined correctly', async () => {
const lines = [
``,
` D SAMPLEPG Ds Qualified `,
` dcl-s myprogramText char(20);`,
` dcl-s sampleDcl char(2);`,
` dcl-enum ENUMTEST qualified;`,
` CONSTANT1 value1;`,
` CONSTANT2 value2;`,
` end-enum;`,
` `,
` dcl-proc testing123 ;`,
` dcl-pi *n ;`,
` end-pi;`,
` `,
` end-proc;`,
` `,
].join(`\n`);

// const kill = cache.findAll(`kill`);

// const killPrototype = kill[0];
// expect(killPrototype.name).toBe(`kill`);
// expect(killPrototype.prototype).toBeTruthy();
// expect(killPrototype.range.start).toBe(71);
// expect(killPrototype.range.end).toBe(74);

// const killProc = kill[1];
// expect(killProc.name).toBe(`kill`);
// expect(killProc.prototype).toBeFalsy();
// expect(killProc.range.start).toBe(741);
// expect(killProc.range.end).toBe(761);
// });
const cache = await parser.getDocs(uri, lines, { ignoreCache: true, withIncludes: false, collectReferences: true });

expect(cache.structs.length).toBe(1);
expect(cache.constants.length).toBe(1);
expect(cache.variables.length).toBe(2);
expect(cache.procedures.length).toBe(1);
});

test('that mixed symbols can be defined correctly', async () => {
const lines = [
``,
``,
` D SAMPLEPG Ds Qualified`,
` F TEST `,
` dcl-s myprogramText char(20);`,
` dcl-s sampleDcl char(2);`,
` dcl-enum ENUMTEST qualified;`,
` CONSTANT1 value1;`,
` CONSTANT2 value2;`,
` end-enum;`,
` `,
` dcl-proc testing123 ;`,
` dcl-pi *n ;`,
` end-pi;`,
` `,
` end-proc;`,
` `,
].join(`\n`);

const cache = await parser.getDocs(uri, lines, { ignoreCache: true, withIncludes: false, collectReferences: true });

expect(cache.structs.length).toBe(1);
expect(cache.files.length).toBe(1);
expect(cache.constants.length).toBe(1);
expect(cache.variables.length).toBe(2);
expect(cache.procedures.length).toBe(1);
});