Fix check not getting formatted in binary expr

ballerina-platform · Jun 22, 2019 · 9e0cc42 · 9e0cc42
1 parent cbf62c2
commit 9e0cc42
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/...server-core/src/main/java/org/ballerinalang/langserver/formatting/FormattingNodeTree.java b/...server-core/src/main/java/org/ballerinalang/langserver/formatting/FormattingNodeTree.java
@@ -432,6 +432,7 @@ public void formatBinaryExprNode(JsonObject node) {
             // Handle left expression whitespaces.
             if (node.has("leftExpression")) {
                 node.getAsJsonObject("leftExpression").add(FormattingConstants.FORMATTING_CONFIG, formatConfig);
+                node.getAsJsonObject("leftExpression").addProperty(FormattingConstants.IS_EXPRESSION, true);
             }
 
             // Handle right expression whitespaces.
@@ -440,6 +441,7 @@ public void formatBinaryExprNode(JsonObject node) {
                 JsonObject rightExprFormatConfig = this.getFormattingConfig(0, 1, 0, false,
                         this.getWhiteSpaceCount(indentWithParentIndentation), true);
                 rightExpression.add(FormattingConstants.FORMATTING_CONFIG, rightExprFormatConfig);
+                rightExpression.addProperty(FormattingConstants.IS_EXPRESSION, true);
             }
         }
     }

diff --git a/language-server/modules/langserver-core/src/test/resources/formatting/check.bal b/language-server/modules/langserver-core/src/test/resources/formatting/check.bal
@@ -70,4 +70,13 @@ check
          parse(num)
   ;
     return x * 10;
+}
+
+public function test1() returns string | error {
+    return "";
+}
+
+public function test2() returns error? {
+    string sd = check name();
+    io:println("Response from organization count query from DB: " +check test1());
 }
diff --git a/...e-server/modules/langserver-core/src/test/resources/formatting/expected/expectedCheck.bal b/...e-server/modules/langserver-core/src/test/resources/formatting/expected/expectedCheck.bal
@@ -72,3 +72,12 @@ function scale5(string num) returns int | error {
     ;
     return x * 10;
 }
+
+public function test1() returns string | error {
+    return "";
+}
+
+public function test2() returns error? {
+    string sd = check name();
+    io:println("Response from organization count query from DB: " + check test1());
+}