From e97417a67e6e48981d6aff10853521efec8bae7a Mon Sep 17 00:00:00 2001
From: Prabushi Samarakoon <prabushisamarakoon@gmail.com>
Date: Thu, 22 Apr 2021 15:07:57 +0530
Subject: [PATCH 1/3] Change embedded toml support extension

Change embedded toml support extension to `be5invis.toml`.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 75620867..2f063772 100644
--- a/package.json
+++ b/package.json
@@ -337,6 +337,6 @@
         "webpack-cli": "^3.3.3"
     },
     "extensionPack": [
-        "bungcip.better-toml"
+        "be5invis.toml"
     ]
 }

From 07dded23f3c66aac0a132709ac6a67ccf8d09a02 Mon Sep 17 00:00:00 2001
From: Prabushi Samarakoon <prabushisamarakoon@gmail.com>
Date: Thu, 22 Apr 2021 15:10:54 +0530
Subject: [PATCH 2/3] Reduce unused warn logs

---
 src/core/extension.ts | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/core/extension.ts b/src/core/extension.ts
index be1c85cd..41540754 100644
--- a/src/core/extension.ts
+++ b/src/core/extension.ts
@@ -248,7 +248,9 @@ export class BallerinaExtension {
     async getBallerinaVersion(ballerinaHome: string, overrideBallerinaHome: boolean): Promise<string> {
         // if ballerina home is overridden, use ballerina cmd inside distribution
         // otherwise use wrapper command
-        debug(`Ballerina Home: ${ballerinaHome}`);
+        if (ballerinaHome) {
+            debug(`Ballerina Home: ${ballerinaHome}`);
+        }
         let distPath = "";
         if (overrideBallerinaHome) {
             distPath = path.join(ballerinaHome, "bin") + path.sep;
@@ -260,9 +262,13 @@ export class BallerinaExtension {
 
         let ballerinaExecutor = '';
         const balPromise: Promise<string> = new Promise((resolve, reject) => {
-            exec(distPath + 'bal' + exeExtension + ' version', (err, stdout, _stderr) => {
-                debug(`bal command stdout: ${stdout}`);
-                debug(`bal command _stderr: ${_stderr}`);
+            exec(distPath + 'bal' + exeExtension + ' version', (err, stdout, stderr) => {
+                if (stdout) {
+                    debug(`bal command stdout: ${stdout}`);
+                }
+                if (stderr) {
+                    debug(`bal command _stderr: ${stderr}`);
+                }
                 if (err) {
                     debug(`bal command err: ${err}`);
                     reject(err);
@@ -280,9 +286,13 @@ export class BallerinaExtension {
             });
         });
         const ballerinaPromise: Promise<string> = new Promise((resolve, reject) => {
-            exec(distPath + 'ballerina' + exeExtension + ' version', (err, stdout, _stderr) => {
-                debug(`ballerina command stdout: ${stdout}`);
-                debug(`ballerina command _stderr: ${_stderr}`);
+            exec(distPath + 'ballerina' + exeExtension + ' version', (err, stdout, stderr) => {
+                if (stdout) {
+                    debug(`ballerina command stdout: ${stdout}`);
+                }
+                if (stderr) {
+                    debug(`ballerina command _stderr: ${stderr}`);
+                }
                 if (err) {
                     debug(`ballerina command err: ${err}`);
                     reject(err);

From 6c1c84ab6ed6dc16cbb6bcfca494dcc51fdc61c1 Mon Sep 17 00:00:00 2001
From: Prabushi Samarakoon <prabushisamarakoon@gmail.com>
Date: Thu, 22 Apr 2021 18:28:13 +0530
Subject: [PATCH 3/3] Update grammar

Update grammar to support https://github.com/ballerina-platform/plugin-vscode/issues/368,
https://github.com/ballerina-platform/plugin-vscode/issues/369, and
https://github.com/ballerina-platform/plugin-vscode/issues/375.
---
 grammar/ballerina-grammar | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grammar/ballerina-grammar b/grammar/ballerina-grammar
index b99715c2..f4249333 160000
--- a/grammar/ballerina-grammar
+++ b/grammar/ballerina-grammar
@@ -1 +1 @@
-Subproject commit b99715c2b747f44b9cbb21b3a2fa72e76dff33f9
+Subproject commit f4249333dad9f0637b6d5d401baf2c387edd77fb