Skip to content

Do not require procedure parms for directives #196

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
Jan 28, 2023
Merged

Do not require procedure parms for directives #196

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
2 changes: 1 addition & 1 deletion server/src/language/linter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,7 +1009,7 @@ export default class Linter {
if (definedProcedure) {
let requiresBlock = false;
// Don't require parms for procedures found in Ctl-Opt
if (statement[0].value.toUpperCase() === `CTL-OPT`) {
if (statement[0].value.toUpperCase() === `CTL-OPT` || statement[0].type === `directive`) {
// do nothing
} else if (statement.length <= i + 1) {
requiresBlock = true;
Expand Down
20 changes: 20 additions & 0 deletions tests/suite/linter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,6 +990,26 @@ exports.linter_Do_Not_Require_Parameters_For_Control_Options = async () => {
assert.strictEqual(errors.length, 0, `Unexpected RequiresParamters error`);
};

exports.linter_Do_Not_Require_Parameters_For_Compile_Directives = async () => {
const lines = [
`**FREE`,
`/if defined(MYPROCEDURE);`,
`/eof;`,
`/endif;`,
`/define ;`,
`dcl-pr MYPROCEDURE;`,
`end-pr;`,
].join(`\n`);

const parser = parserSetup();
const cache = await parser.getDocs(uri, lines);
const { errors } = Linter.getErrors({ uri, content: lines }, {
RequiresParameter: true
}, cache);

assert.strictEqual(errors.length, 0, `Unexpected RequiresParamters error`);
};

/**
* Check that local variables are not in global scope
*/
Expand Down