Support for removing indicator variables

Signed-off-by: worksofliam <mrliamallan@live.co.uk>

Author: worksofliam

src/language/sql/document.ts

@@ -269,14 +269,17 @@ export default class Document {
           break;
 
         case `remove`:
-          newContent = newContent.substring(0, start) + newContent.substring(end+1);
+          newContent = newContent.substring(0, start) + newContent.substring(end);
+          if (newContent[start-1] === ` ` && newContent[start] === ` `) {
+            newContent = newContent.substring(0, start-1) + newContent.substring(start);
+          }
           break;
       }
     }
 
     return {
       changed: areas.length > 0,
-      content: newContent,
+      content: newContent.trim(),
       parameterCount
     };
   }

src/language/sql/statement.ts

@@ -662,11 +662,16 @@ export default class Statement {
 		let ranges: {type: "remove"|"marker", range: IRange}[] = [];
 		let intoClause: Token|undefined;
 		let declareStmt: Token|undefined;
+		let lastTokenWasMarker = false;
 
 		for (let i = 0; i < this.tokens.length; i++) {
 			const prevToken = this.tokens[i-1];
 			const currentToken = this.tokens[i];
 
+			if (!tokenIs(currentToken, `colon`)) {
+				lastTokenWasMarker = false;
+			}
+
 			switch (currentToken.type) {
 				case `statementType`:
 					const currentValue = currentToken.value.toLowerCase();
@@ -752,14 +757,15 @@ export default class Statement {
 
 					if (endToken) {
 						ranges.push({
-							type: `marker`,
+							type: lastTokenWasMarker ? `remove` : `marker`,
 							range: {
 								start: currentToken.range.start,
-								end: endToken.range.end
+								end: (endToken.range.end)
 							}
 						});
 
-						i = followingTokenI;
+						lastTokenWasMarker = true;
+						i = (followingTokenI-1);
 					}
 
 					break;

src/language/sql/tests/statements.test.ts

@@ -1886,7 +1886,7 @@ describe(`Parameter statement tests`, () => {
     const result = document.removeEmbeddedAreas(statement);
     expect(result.parameterCount).toBe(1);
     expect(result.content).toBe([
-      `  SELECT EMPNO, FIRSTNME, LASTNAME, JOB`,
+      `SELECT EMPNO, FIRSTNME, LASTNAME, JOB`,
       `  FROM EMPLOYEE`,
       `  WHERE WORKDEPT = ?`
     ].join(`\n`));
@@ -1960,6 +1960,32 @@ describe(`Parameter statement tests`, () => {
     expect(result.changed).toBe(false);
   });
 
+  test('Remove indicator variables', () => {
+    const content = [
+      `UPDATE CORPDATA.EMPLOYEE`,
+      `SET PHONENO = :NEWPHONE:PHONEIND`,
+      `WHERE EMPNO = :EMPID;`,
+      ``,
+      `bind: '3535', '000110';`,
+    ].join(`\n`);
+
+    const expectedContent = [
+      `UPDATE CORPDATA.EMPLOYEE`,
+      `SET PHONENO = ?`,
+      `WHERE EMPNO = ?`,
+    ].join(`\n`);
+
+    const document = new Document(content);
+    const statements = document.statements;
+    expect(statements.length).toBe(2);
+
+    const statement = statements[0];
+    const result = document.removeEmbeddedAreas(statement);
+    console.log(result.content);
+    expect(result.parameterCount).toBe(2);
+    expect(result.content).toBe(expectedContent);
+  });
+
   test(`Callable blocks`, () => {
     const lines = [
         `call qsys2.create_abcd();`,