Merge pull request #335 from sebCIL/Fix/copy_include_error

Fix(getIncludeFromDirective): ignore the comment line

Author: worksofliam

language/parser.js

@@ -126,7 +126,7 @@ export default class Parser {
 	 */
   static getIncludeFromDirective(line) {
     if (line.includes(`*`)) return; // Likely comment
-    if (line.includes(`//`)) return; // Likely comment
+    if (line.trim().startsWith(`//`)) return; // Likely comment
 
     const upperLine = line.toUpperCase();
     let comment = -1;
@@ -441,23 +441,23 @@ export default class Parser {
               // End of parsing for this file
               break;
             } else
-            if (parts[0] === `/IF`) {
+              if (parts[0] === `/IF`) {
               // Directive IF
-              directIfScope += 1;
-              continue;
-            } else
-            if (parts[0] === `/ENDIF`) {
-              // Directive ENDIF
-              directIfScope -= 1;
-              continue;
-            } else
-            if (directIfScope > 0) {
-              // Ignore lines inside the IF scope.
-              continue;
-            } else
-            if (line.startsWith(`/`)) {
-              continue;
-            }
+                directIfScope += 1;
+                continue;
+              } else
+                if (parts[0] === `/ENDIF`) {
+                  // Directive ENDIF
+                  directIfScope -= 1;
+                  continue;
+                } else
+                  if (directIfScope > 0) {
+                    // Ignore lines inside the IF scope.
+                    continue;
+                  } else
+                    if (line.startsWith(`/`)) {
+                      continue;
+                    }
           }
 
           if (pieces.length > 1 && pieces[1].includes(`//`)) line = pieces[0] + `;`;
@@ -671,9 +671,9 @@ export default class Parser {
             if (dsScopes.length === 1) {
               scope.structs.push(dsScopes.pop());
             } else
-            if (dsScopes.length > 1) {
-              dsScopes[dsScopes.length - 2].subItems.push(dsScopes.pop());
-            }
+              if (dsScopes.length > 1) {
+                dsScopes[dsScopes.length - 2].subItems.push(dsScopes.pop());
+              }
             break;
 
           case `DCL-PR`:
@@ -914,8 +914,8 @@ export default class Parser {
                       currentSqlItem.name = qualifiedObjectPath.name;
 
                       if (currentSqlItem.name)
-
-                      currentSqlItem.keywords = [];
+                        currentSqlItem.keywords = [];
+                      
                       currentSqlItem.description = qualifiedObjectPath.schema || ``;
 
                       currentSqlItem.position = {

tests/suite/basics.test.ts

@@ -398,6 +398,66 @@ test('test12', async () => {
   expect(theLocalProc.scope.variables.length).toBe(1);
 });
 
+test('test13', async () => {
+  const lines = [
+    `**FREE`,
+    ``,
+    `Ctl-Opt DftActGrp(*No);`,
+    ``,
+    `/copy './tests/rpgle/copy1.rpgle' // Test copy`,
+    ``,
+    `Dcl-S globalVar Char(20);`,
+    ``,
+    `Dcl-C theConstant 'Hello world';`,
+    ``,
+    `globalVar = theConstant;`,
+    ``,
+    `theLocalProc(globalVar);`,
+    ``,
+    `Return;`,
+    ``,
+    `Dcl-Proc theLocalProc;`,
+    `  Dcl-Pi *N;`,
+    `    newValue Char(20);`,
+    `  End-Pi;`,
+    `  Dcl-S localVar Char(20);`,
+    `  localVar = %trimr(newValue) + '!';`,
+    `  globalVar = localVar;`,
+    `End-Proc;`,
+    ``
+  ].join(`\n`);
+
+  const cache = await parser.getDocs(uri, lines, {withIncludes: true, ignoreCache: true});
+
+  expect(cache.includes.length).toBe(1);
+
+  expect(cache.variables.length).toBe(1);
+  expect(cache.constants.length).toBe(1);
+
+  // One prototype and one declared
+  expect(cache.procedures.length).toBe(2);
+
+  // Valid names
+  expect(cache.procedures[0].name).toBe(`theExtProcedure`);
+  expect(cache.procedures[1].name).toBe(`theLocalProc`);
+
+  const theLocalProc = cache.find(`theLocalProc`);
+
+  expect(theLocalProc.range).toEqual({
+    start: 16,
+    end: 23
+  });
+
+  // Has a parameter
+  expect(theLocalProc.subItems.length).toBe(1);
+
+  // Has a local scope
+  expect(theLocalProc.scope !== undefined).toBe(true);
+
+  // Should have a local variable
+  expect(theLocalProc.scope.variables.length).toBe(1);
+});
+
 test('indicators1', async () => {
   const lines = [
     `**FREE`,