Fix broken range for oneline struct

Signed-off-by: Liam Barry Allan <[email protected]>
codefori · Aug 21, 2022 · 524e60c · 524e60c
1 parent 649bf3f
commit 524e60c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/src/language/parser.js b/src/language/parser.js
@@ -578,6 +578,7 @@ module.exports = class Parser {
 
               // Does the keywords include a keyword that makes end-ds useless?
               if (currentItem.keywords.some(keyword => oneLineTriggers[`DCL-DS`].some(trigger => keyword.startsWith(trigger)))) {
+                currentItem.range.end = lineNumber;
                 scope.structs.push(currentItem);
               } else {
                 currentItem.readParms = true;
@@ -1039,7 +1040,7 @@ module.exports = class Parser {
 
                   currentItem.range = {
                     start: lineNumber,
-                    end: null
+                    end: lineNumber
                   };
 
                   currentGroup = `procedures`;

diff --git a/tests/suite/basics.js b/tests/suite/basics.js
@@ -455,7 +455,7 @@ exports.subds1 = async () => {
   });
 };
 
-exports.dothingy = async () => {
+exports.range1 = async () => {
   const lines = [
     `**FREE`,
     `///`,
@@ -501,4 +501,28 @@ exports.dothingy = async () => {
     start: 21,
     end: 23
   });
-};
+};
+
+exports.range2 = async () => {
+  const lines = [
+    `**free`,
+    `Dcl-S  FullCmd      Char(32);`,
+    `Dcl-DS ABCD  LikeDS(BBOOP);`,
+    ``,
+    ``,
+    `Dcl-S Eod          Ind;`,
+  ].join(`\n`);
+
+  const parser = new Parser();
+  const cache = await parser.getDocs(uri, lines);
+
+  assert.strictEqual(cache.variables.length, 2);
+  assert.strictEqual(cache.structs.length, 1);
+
+  const ABCD = cache.find(`ABCD`);
+  assert.strictEqual(ABCD.keyword[`LIKEDS`], `BBOOP`);
+  assert.deepStrictEqual(ABCD.range, {
+    start: 2,
+    end: 2
+  });
+}