Fix for comments within statements (#100)

Signed-off-by: Liam Barry Allan <[email protected]>
codefori · Jul 26, 2022 · 5e81bd1 · 5e81bd1
1 parent 2c71977
commit 5e81bd1
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 2 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -12,8 +12,7 @@
 			"skipFiles": [
 				"<node_internals>/**"
 			],
-			"type": "node",
-			"args": ["error1"]
+			"type": "node"
 		},
 		{
 			"name": "Run Extension",

diff --git a/src/language/linter.js b/src/language/linter.js
@@ -6,6 +6,7 @@ const Declaration = require(`./models/declaration`);
 const Statement = require(`./statement`);
 const oneLineTriggers = require(`./models/oneLineTriggers`);
 const IssueRange = require(`./models/ContentRange`);
+const { isContinueStatement } = require("typescript");
 
 const errorText = {
   'BlankStructNamesCheck': `Struct names cannot be blank (\`*N\`).`,
@@ -152,6 +153,10 @@ module.exports = class Linter {
         }
 
         if (isLineComment) {
+          if (isContinueStatement) {
+            currentStatement += line + ``.padEnd(newLineLength, ` `);
+          }
+
           const comment = line.substring(currentIndent + 2).trimEnd();
           if (rules.PrettyComments) {
             if (comment === ``) {

diff --git a/tests/suite/index.js b/tests/suite/index.js
@@ -1065,6 +1065,41 @@ module.exports = {
     assert.strictEqual(errors[0].newValue, `%trim`);
   },
 
+  linter7_casing10: async () => {
+    const lines = [
+      `**free`,
+      ``,
+      `dcl-s sFirstName char(10);`,
+      `dcl-s sEmpNo char(6);`,
+      ``,
+      `Exec Sql`,
+      `  // Break The Parser`,
+      `  Select`,
+      `    empno`,
+      `  Into`,
+      `    :sEmpNo`,
+      `  From`,
+      `    sample.employee`,
+      `  Where`,
+      `    firstnme = :SFIRSTNAME;`,
+      ``,
+      `return;`,
+    ].join(`\n`);
+
+    const parser = new Parser();
+    const cache = await parser.getDocs(URI, lines);
+    const { errors } = Linter.getErrors(lines, {
+      IncorrectVariableCase: true
+    }, cache);
+
+    assert.strictEqual(errors.length, 1, `Expect length of 1`);
+    assert.strictEqual(errors[0].range.start.line, 5);
+    assert.strictEqual(errors[0].range.end.line, 14);
+    assert.strictEqual(errors[0].offset.position, 120);
+    assert.strictEqual(errors[0].offset.length, 130);
+    assert.strictEqual(errors[0].newValue, `sFirstName`)
+  },
+
   linter8: async () => {
     const lines = [
       `**FREE`,