Merge pull request #24220 from nadeeshaan/dev-branh

Make command line formatter use the old parser
ballerina-platform · Jun 17, 2020 · 6c7e912 · 6c7e912
2 parents 3a204d2 + 6c023e4
commit 6c7e912
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/language-server/modules/langserver-core/src/test/resources/testng.xml b/language-server/modules/langserver-core/src/test/resources/testng.xml
@@ -30,7 +30,7 @@ under the License.
 <!--            <package name="org.ballerinalang.langserver.highlighting.*"/>-->
             <package name="org.ballerinalang.langserver.definition.*"/>
 <!--            <package name="org.ballerinalang.langserver.docsymbol.*"/>-->
-<!--            <package name="org.ballerinalang.langserver.hover.*"/>-->
+            <package name="org.ballerinalang.langserver.hover.*"/>
 <!--            <package name="org.ballerinalang.langserver.implementation.*"/>-->
 <!--            <package name="org.ballerinalang.langserver.references.*"/>-->
 <!--            <package name="org.ballerinalang.langserver.rename.*"/>-->

diff --git a/misc/ballerina-formatter/src/main/java/org/ballerinalang/format/FormatUtil.java b/misc/ballerina-formatter/src/main/java/org/ballerinalang/format/FormatUtil.java
@@ -51,6 +51,7 @@
 import static org.ballerinalang.compiler.CompilerOptionName.COMPILER_PHASE;
 import static org.ballerinalang.compiler.CompilerOptionName.EXPERIMENTAL_FEATURES_ENABLED;
 import static org.ballerinalang.compiler.CompilerOptionName.LOCK_ENABLED;
+import static org.ballerinalang.compiler.CompilerOptionName.NEW_PARSER_ENABLED;
 import static org.ballerinalang.compiler.CompilerOptionName.OFFLINE;
 import static org.ballerinalang.compiler.CompilerOptionName.PRESERVE_WHITESPACE;
 import static org.ballerinalang.compiler.CompilerOptionName.PROJECT_DIR;
@@ -323,6 +324,7 @@ private static CompilerContext getCompilerContext(Path sourceRootPath) {
         options.put(LOCK_ENABLED, Boolean.toString(false));
         options.put(EXPERIMENTAL_FEATURES_ENABLED, Boolean.toString(true));
         options.put(PRESERVE_WHITESPACE, Boolean.toString(true));
+        options.put(NEW_PARSER_ENABLED, Boolean.toString(false));
 
         return context;
     }