Ensure ranges are attached to definitions

Signed-off-by: Liam Barry Allan <[email protected]>
codefori · Aug 19, 2022 · 6e3d5a2 · 6e3d5a2
1 parent b6a3d73
commit 6e3d5a2
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/src/language/linter.js b/src/language/linter.js
@@ -868,7 +868,7 @@ module.exports = class Linter {
 
                       if (rules.CollectReferences) {
                         let defRef;
-                        if (currentProcedure) {
+                        if (currentProcedure && currentProcedure.scope) {
                           defRef = currentProcedure.scope.find(upperName);
 
                           if (!defRef) {

diff --git a/src/language/parser.js b/src/language/parser.js
@@ -566,6 +566,11 @@ module.exports = class Parser {
                 line: lineNumber
               }
 
+              currentItem.range = {
+                start: lineNumber,
+                end: null
+              };
+
               currentGroup = `structs`;
 
               // Expand the LIKEDS value if there is one.
@@ -588,6 +593,11 @@ module.exports = class Parser {
             break;
 
           case `END-DS`:
+            if (dsScopes.length > 0) {
+              const currentDs = dsScopes[dsScopes.length - 1];
+              currentDs.range.end = lineNumber;
+            }
+
             if (dsScopes.length === 1) {
               scope.structs.push(dsScopes.pop());
             } else
@@ -613,8 +623,14 @@ module.exports = class Parser {
 
                 currentItem.readParms = true;
 
+                currentItem.range = {
+                  start: lineNumber,
+                  end: null
+                };
+
                 // Does the keywords include a keyword that makes end-ds useless?
                 if (currentItem.keywords.some(keyword => oneLineTriggers[`DCL-PR`].some(trigger => keyword.startsWith(trigger)))) {
+                  currentItem.range.end = lineNumber;
                   scope.procedures.push(currentItem);
                   resetDefinition = true;
                 }
@@ -626,6 +642,7 @@ module.exports = class Parser {
 
           case `END-PR`:
             if (currentItem && currentItem.type === `procedure`) {
+              currentItem.range.end = lineNumber;
               scope.procedures.push(currentItem);
               resetDefinition = true;
             }
@@ -996,6 +1013,11 @@ module.exports = class Parser {
                   line: lineNumber
                 }
 
+                currentItem.range = {
+                  start: lineNumber,
+                  end: null
+                };
+
                 expandDs(file, currentItem);
 
                 currentGroup = `structs`;
@@ -1014,6 +1036,11 @@ module.exports = class Parser {
                     path: file,
                     line: lineNumber
                   }
+
+                  currentItem.range = {
+                    start: lineNumber,
+                    end: null
+                  };
 
                   currentGroup = `procedures`;
                   scope.procedures.push(currentItem);
@@ -1034,6 +1061,7 @@ module.exports = class Parser {
                 break;
 
               default:
+                // No type, must be either a struct subfield OR a parameter
                 if (!currentItem) {
                   switch (currentGroup) {
                   case `structs`:
@@ -1082,6 +1110,8 @@ module.exports = class Parser {
                       currentItem.subItems[currentItem.subItems.length - 1].keywords.push(Fixed.getPrettyType(dSpec), ...dSpec.keywords);
                     }
                   }
+
+                  currentItem.range.end = lineNumber;
                 }
                 break;
               }