Fix formatting of line comments

Author: vetlek

server/src/language-service/formatProvider.ts

@@ -33,7 +33,7 @@ export const jinjaIfEndRegex = /\{%-?\s+endif\s+%}$/;
 export const jinjaExpressionRegex = /\{%[\S\s]*%\}/;
 export const stopFormattingRegex = /^\{#\s+format:off\s+#}$/;
 export const startFormattingRegex = /^\{#\s+format:on\s+#}$/;
-export const lineCommentRegex = /^\s*\/\/\s|\*\/\s*$|#}\s*$|%}\s*$/;
+export const lineCommentRegex = /\/\/\s|\*\/\s*$|#}\s*$|%}\s*$/;
 
 export class FormattingProvider {
     private readonly cnfgProvider: ISepticConfigProvider;

server/src/test/fixtures/formatting/lineCommentExpected.cnfg

@@ -0,0 +1,9 @@
+  CalcPvr:       Test
+         Text1=  ""
+         Text2=  ""
+           Alg=  "1+1" // Test line comment
+
+  CalcPvr:       Something
+         Text1=  ""
+         Text2=  ""
+           Alg=  "2"

server/src/test/fixtures/formatting/lineCommentOriginal.cnfg

@@ -0,0 +1,10 @@
+  CalcPvr:       Test
+         Text1=  ""
+         Text2=  ""
+           Alg=  "1+1" // Test line comment
+
+           
+  CalcPvr:       Something
+         Text1=  ""
+         Text2=  ""
+           Alg=  "2"

server/src/test/format.test.ts

@@ -80,4 +80,16 @@ describe("Test formatting", () => {
         );
         compareFiles(expectedContent, formattedContent);
     });
+    it("Expect correct formatting of line comments with jinja", () => {
+        const content = loadFile("formatting/lineCommentOriginal.cnfg");
+        const doc = TextDocument.create("", "", 0, content);
+        const cnfg = parseSepticSync(doc.getText());
+        const formatter = new SepticCnfgFormatter(cnfg, doc);
+        const edits = formatter.format();
+        const formattedContent = TextDocument.applyEdits(doc, edits);
+        const expectedContent = loadFile(
+            "formatting/lineCommentExpected.cnfg"
+        );
+        compareFiles(expectedContent, formattedContent);
+    });
 });