Better support for overload in prototypes

codefori · Mar 4, 2022 · d1dec6c · d1dec6c
1 parent 957af5e
commit d1dec6c
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 5 deletions.
diff --git a/src/language/linter.js b/src/language/linter.js
@@ -894,12 +894,9 @@ module.exports = class Linter {
           if ([
             `IF`, `ELSE`, `ELSEIF`, `FOR`, `FOR-EACH`, `DOW`, `DOU`, `MONITOR`, `ON-ERROR`, `ON-EXIT`, `BEGSR`, `SELECT`, `WHEN`, `OTHER`, `DCL-PROC`, `DCL-PI`, `DCL-PR`, `DCL-DS`
           ].includes(opcode)) {
-            if (opcode === `DCL-DS` && oneLineTriggers[opcode].some(trigger => upperLine.includes(trigger))) {
-            //No change
+            if ([`DCL-DS`, `DCL-PI`, `DCL-PR`].includes(opcode) && oneLineTriggers[opcode].some(trigger => upperLine.includes(trigger))) {
+              //No change
             } 
-            else if (opcode === `DCL-PI` && oneLineTriggers[opcode].some(trigger => upperLine.includes(trigger))) {
-            //No change
-            }
             else if (opcode === `SELECT`) {
               if (skipIndentCheck === false) expectedIndent += (indent*2); 
             }

diff --git a/src/language/models/oneLineTriggers.js b/src/language/models/oneLineTriggers.js
@@ -1,4 +1,5 @@
 module.exports = {
   'DCL-DS': [`LIKEDS`, `LIKEREC`, `END-DS`],
   'DCL-PI': [`END-PI`],
+  'DCL-PR': [`OVERLOAD`]
 }
diff --git a/src/language/parser.js b/src/language/parser.js
@@ -537,6 +537,12 @@ module.exports = class Parser {
 
                 currentItem.readParms = true;
 
+                // Does the keywords include a keyword that makes end-ds useless?
+                if (currentItem.keywords.some(keyword => oneLineTriggers[`DCL-PR`].some(trigger => keyword.startsWith(trigger)))) {
+                  scope.procedures.push(currentItem);
+                  resetDefinition = true;
+                }
+
                 currentDescription = [];
               }
             }

diff --git a/tests/suite/index.js b/tests/suite/index.js
@@ -2520,5 +2520,43 @@ module.exports = {
       },
       newValue: undefined,
     });
+  },
+
+  overload1: async () => {
+    const lines = [
+      `**FREE`,
+      ``,
+      `Dcl-PR json_setBool pointer extproc(*CWIDEN : 'jx_SetBoolByName');`,
+      `  node pointer value;`,
+      `  nodePath pointer value options(*string);`,
+      `  value ind value;`,
+      `End-PR;`,
+      ``,
+      `Dcl-PR json_setNum pointer extproc(*CWIDEN : 'jx_SetDecByName');`,
+      `  node pointer value;`,
+      `  nodePath pointer value options(*string);`,
+      `  value packed(30:15) value;`,
+      `End-PR;`,
+      ``,
+      `Dcl-PR json_set pointer overload ( `,
+      `    json_setBool: `,
+      `    json_setNum `,
+      `);`,
+      ``,
+      `Dcl-PR json_nodeType int(5) extproc(*CWIDEN : 'jx_GetNodeType');`,
+      `  node pointer value;`,
+      `End-PR;`,
+    ].join(`\n`);
+
+    const parser = new Parser();
+    const cache = await parser.getDocs(URI, lines);
+
+    const { indentErrors } = Linter.getErrors(lines, {
+      indent: 2,
+      PrettyComments: true
+    }, cache);
+
+    assert.strictEqual(cache.procedures.length, 4);
+    assert.strictEqual(indentErrors.length, 0);
   }
 }