Fix evalExpression

Prompt doesn't go anywhere since 0.7.1

Author: julienduchesne

package-lock.json

@@ -5,7 +5,7 @@
 	"description": "Full code support (formatting, highlighting, navigation, debugging etc) for Jsonnet",
 	"license": "Apache License Version 2.0",
 	"publisher": "Grafana",
-	"version": "0.7.1",
+	"version": "0.7.2",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/grafana/vscode-jsonnet"

package.json

@@ -95,13 +95,22 @@ export async function activate(context: ExtensionContext): Promise<void> {
     }),
     commands.registerCommand('jsonnet.evalFile', evalCommand(false)),
     commands.registerCommand('jsonnet.evalFileYaml', evalCommand(true)),
-    commands.registerCommand('jsonnet.evalExpression', evalExpressionCommand(false)),
-    commands.registerCommand('jsonnet.evalExpressionYaml', evalExpressionCommand(true))
+    commands.registerCommand('jsonnet.evalExpression', evalCommand(false, true)),
+    commands.registerCommand('jsonnet.evalExpressionYaml', evalCommand(true, true))
   );
 }
 
-function evalCommand(yaml: boolean, expr = '') {
+function evalCommand(yaml: boolean, promptExpr = false) {
   return async () => {
+    let expr = '';
+    if (promptExpr) {
+      expr = await window.showInputBox({ prompt: 'Expression to evaluate' });
+      if (expr === undefined || expr === '') {
+        window.showErrorMessage('No expression provided');
+        return;
+      }
+    }
+
     const currentFilePath = evalFilePath(window.activeTextEditor);
     const params: ExecuteCommandParams = {
       command: expr === '' ? `jsonnet.evalFile` : `jsonnet.evalExpression`,
@@ -151,18 +160,6 @@ function evalCommand(yaml: boolean, expr = '') {
   };
 }
 
-function evalExpressionCommand(yaml: boolean) {
-  return async () => {
-    window.showInputBox({ prompt: 'Expression to evaluate' }).then(async (expr) => {
-      if (expr) {
-        evalCommand(yaml, expr);
-      } else {
-        window.showErrorMessage('No expression provided');
-      }
-    });
-  };
-}
-
 function createTmpFile(yaml): string {
   const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'jsonnet-eval'));
   const fileEnding = yaml ? 'yaml' : 'json';