cqframework#437: newLine() called after processing comment.

echicoine-icf · Apr 26, 2021 · 7448c07 · 7448c07
1 parent 8a3fd55
commit 7448c07
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/.../cql-formatter/src/main/java/org/cqframework/cql/tools/formatter/CqlFormatterVisitor.java b/.../cql-formatter/src/main/java/org/cqframework/cql/tools/formatter/CqlFormatterVisitor.java
@@ -248,6 +248,7 @@ private void appendComment(CommentToken token) {
                     .append(whitespaceBefore);
         }
         output.append(token.token.getText()).append(whitespace);
+        newLine();
     }
 
     private void appendTerminal(String terminal) {

diff --git a/...-formatter/src/test/java/org/cqframework/cql/tools/formatter/CqlFormatterVisitorTest.java b/...-formatter/src/test/java/org/cqframework/cql/tools/formatter/CqlFormatterVisitorTest.java
@@ -64,6 +64,8 @@ public void TestFormatterSpecific() throws IOException {
         Assert.assertFalse(inError);
         runTest("git-issue-613.cql");
         Assert.assertFalse(inError);
+        runTest("git-issue-437.cql");
+        Assert.assertFalse(inError);
         try {
             runTest("invalid-syntax.cql");
         } catch (AssertionError ae) {

diff --git a/...ls/cql-formatter/src/test/resources/org/cqframework/cql/tools/formatter/git-issue-437.cql b/...ls/cql-formatter/src/test/resources/org/cqframework/cql/tools/formatter/git-issue-437.cql
@@ -0,0 +1,6 @@
+define "Encounter With Principal Procedure of SCIP VTE Selected Surgery":
+  "Encounter With Age Range and Without VTE Diagnosis or Obstetrical Conditions" QualifyingEncounter
+    with ( "SCIP VTE Selected Surgery" Procedure
+      where Procedure.rank = 1 //in "Principal"
+          ) SelectedSCIPProcedure
+      such that SelectedSCIPProcedure.relevantPeriod during QualifyingEncounter.relevantPeriod