Handle procedure out of scope

Signed-off-by: Liam Barry Allan <mrliamallan@live.co.uk>

Author: worksofliam

server/src/language/parser.js

@@ -690,12 +690,14 @@ export default class Parser {
 
           case `END-PROC`:
             //Procedures can only exist in the global scope.
-            currentItem = scopes[0].procedures.find(proc => proc.name === currentProcName);
+            if (scopes.length > 1) {
+              currentItem = scopes[0].procedures.find(proc => proc.name === currentProcName);
 
-            if (currentItem && currentItem.type === `procedure`) {
-              currentItem.scope = scopes.pop();
-              currentItem.range.end = lineNumber;
-              resetDefinition = true;
+              if (currentItem && currentItem.type === `procedure`) {
+                currentItem.scope = scopes.pop();
+                currentItem.range.end = lineNumber;
+                resetDefinition = true;
+              }
             }
             break;
 
@@ -956,13 +958,15 @@ export default class Parser {
                   scopes.push(new Cache());
                 }
               } else {
-                //Procedures can only exist in the global scope.
-                currentItem = scopes[0].procedures.find(proc => proc.name === currentProcName);
+                if (scopes.length > 1) {
+                  //Procedures can only exist in the global scope.
+                  currentItem = scopes[0].procedures.find(proc => proc.name === currentProcName);
 
-                if (currentItem && currentItem.type === `procedure`) {
-                  currentItem.scope = scopes.pop();
-                  currentItem.range.end = lineNumber;
-                  resetDefinition = true;
+                  if (currentItem && currentItem.type === `procedure`) {
+                    currentItem.scope = scopes.pop();
+                    currentItem.range.end = lineNumber;
+                    resetDefinition = true;
+                  }
                 }
               }
             }
@@ -1150,7 +1154,9 @@ export default class Parser {
       }
     }
 
-    scopes[0].keyword = Parser.expandKeywords(keywords);
+    if (scopes.length > 0) {
+      scopes[0].keyword = Parser.expandKeywords(keywords);
+    }
 
     const parsedData = scopes[0];
 

tests/suite/basics.js

@@ -620,6 +620,53 @@ exports.issue_168 = async () => {
     `Return; `,
   ].join(`\n`);
 
+  const parser = await parserSetup();
+  const cache = await parser.getDocs(uri, lines);
+}
+
+exports.issues_168a = async () => {
+  const lines = [
+    `**free`,
+    `Ctl-opt datfmt(*iso) timfmt(*iso) alwnull(*usrctl) debug;`,
+    ``,
+    `Dcl-F TESTFILE3 Keyed Usage(*Update :*Delete);`,
+    ``,
+    `Dcl-Pr TESTCHAIN1 ExtPgm('TESTCHAIN1');`,
+    `Parm1 Char(1);`,
+    `End-Pr TESTCHAIN1;`,
+    ``,
+    `Dcl-Pi TESTCHAIN1;`,
+    `Parm1 Char(1);`,
+    `End-Pi TESTCHAIN1;`,
+    ``,
+    `Dcl-DS AAA;`,
+    `a Char(10);`,
+    `Dcl-ds a;`,
+    `End-ds a;`,
+    `End-Ds AAA;`,
+    ``,
+    `If (Parm1 = 'N');`,
+    `Chain ('CHIAVE' :1) TESTFILE3;`,
+    `Else;`,
+    `Chain ('CHIAVE' :1) TESTFILE3;`,
+    `EndIf;`,
+    ``,
+    `job_name = 'TESTFILE1';`,
+    ``,
+    `Update TESTREC;`,
+    ``,
+    `Return;`,
+    ``,
+    `// ____________________________________________________________________________`,
+    `Dcl-Proc aaa;`,
+    ``,
+    `Dcl-Pi aaa;`,
+    `end-proc;`,
+    `End-Pi aaa;`,
+    `// ____________________________________________________________________________`,
+    ``,
+    `End-Proc aaa;`,
+  ].join(`\n`);
 
   const parser = await parserSetup();
   const cache = await parser.getDocs(uri, lines);