Skip to content

Fix multiline statement range handling #457

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
Aug 26, 2025
Merged

Fix multiline statement range handling #457

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
26 changes: 15 additions & 11 deletions language/parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,12 @@ export default class Parser {
if (withBlocks) {
tokens = createBlocks(tokens);
}


// Remove newlines
if (tokens.some(t => t.type === `newline`)) {
tokens = tokens.filter(t => t.type !== `newline`);
}

return tokens;
}

Expand Down Expand Up @@ -388,7 +393,6 @@ export default class Parser {
//Now the real work
const parseContent = async (fileUri: string, allContent: string) => {
const EOL = allContent.includes(`\r\n`) ? `\r\n` : `\n`;
const LINEEND = ``.padEnd(EOL.length);
let lines = allContent.split(EOL);

let postProcessingStatements: {[procedure: string]: Token[][]} = {'GLOBAL': []};
Expand Down Expand Up @@ -664,7 +668,7 @@ export default class Parser {
if ([spec, comment].includes(`*`)) {
if (currentStmtStart && currentStmtStart.content) {
// Since we're in an extended statement (usually fixed exec), we still need to collect the lengths for the tokeniser
currentStmtStart.content += ``.padEnd(baseLine.length) + LINEEND;
currentStmtStart.content += ``.padEnd(baseLine.length) + EOL;
}

continue;
Expand All @@ -677,7 +681,7 @@ export default class Parser {
} else if (comment === `+` && fixedExec && currentStmtStart.content) {
// Fixed format EXEC SQL
baseLine = ``.padEnd(7) + baseLine.substring(7);
currentStmtStart.content += baseLine + LINEEND;
currentStmtStart.content += baseLine + EOL;
continue;
} else {
if (spec === ` `) {
Expand Down Expand Up @@ -714,7 +718,7 @@ export default class Parser {
// if part of a continued statement to ensure positions are correct.
// See issue_358_no_reference_2
if (currentStmtStart && currentStmtStart.content) {
currentStmtStart.content += ``.padEnd(baseLine.length) + LINEEND;
currentStmtStart.content += ``.padEnd(baseLine.length) + EOL;
}
continue;
};
Expand All @@ -736,7 +740,7 @@ export default class Parser {
currentStmtStart = {
line: lineNumber,
index: lineIndex,
content: baseLine + LINEEND
content: baseLine + EOL
}
continue;
case '/END':
Expand All @@ -747,15 +751,15 @@ export default class Parser {
case '/':
// Comments in SQL, usually free-format
if (parts[1] === `*` && currentStmtStart) {
currentStmtStart.content += ``.padEnd(baseLine.length) + LINEEND;
currentStmtStart.content += ``.padEnd(baseLine.length) + EOL;
continue;
}
break;
default:
// Maybe we're in a fixed exec statement, but a directive is being used.
// See test case references_21_fixed_exec1
if (fixedExec && currentStmtStart && currentStmtStart.content) {
currentStmtStart.content += ``.padEnd(baseLine.length) + LINEEND;
currentStmtStart.content += ``.padEnd(baseLine.length) + EOL;
continue;
}
break;
Expand Down Expand Up @@ -853,7 +857,7 @@ export default class Parser {
// This happens when we put a comment on a line which is part of one long statement.
// See references_24_comment_in_statement
if (currentStmtStart.content) {
currentStmtStart.content += ``.padEnd(baseLine.length) + LINEEND;
currentStmtStart.content += ``.padEnd(baseLine.length) + EOL;
}
} else {
if (stripComment(line).endsWith(`;`)) {
Expand All @@ -875,7 +879,7 @@ export default class Parser {
if (currentStmtStart.content.endsWith(`-`))
currentStmtStart.content = currentStmtStart.content.substring(0, currentStmtStart.content.length - 1) + ` `;

currentStmtStart.content += LINEEND;
currentStmtStart.content += EOL;

continue;
}
Expand Down Expand Up @@ -1025,7 +1029,7 @@ export default class Parser {
lastItem.subItems.push(currentItem);
} else {
// Otherwise, we push as a new item
currentItem.range.end = currentStmtStart.line;
currentItem.range.end = tokens[tokens.length-1].range.line;
scope.addSymbol(currentItem);
}
} else {
Expand Down
27 changes: 27 additions & 0 deletions tests/suite/basics.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1980,4 +1980,31 @@ test('**free after first line (#451)', async () => {
expect(cache).toBeDefined();

expect(cache.find(`txtMsg`)).toBeDefined();
});

test('multi-line definition (#442)', async () => {
const lines = [
`**free`,
``,
`dcl-s myprogramText char(20);`,
``,
`dcl-ds name qualified dim;`,
`end-ds;`,
``,
`dcl-ds person qualified dim`,
`end-ds;`,
].join(`\n`);

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

expect(cache).toBeDefined();

const name = cache.find(`name`);
expect(name).toBeDefined();
expect(name.range).toMatchObject({ start: 4, end: 5 });

const person = cache.find(`person`);
expect(person).toBeDefined();
console.log(person);
expect(person.range).toMatchObject({ start: 7, end: 8 });
});