@kusto/monaco-kusto 3.2.6 → 3.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kusto/monaco-kusto",
-    "version": "3.2.6",
+    "version": "3.2.7",
     "description": "CSL, KQL plugin for the Monaco Editor",
     "author": {
         "name": "Microsoft"
@@ -55,7 +55,7 @@
     },
     "dependencies": {
         "@kusto/language-service": "2.0.0-beta.0",
-        "@kusto/language-service-next": "0.0.45"
+        "@kusto/language-service-next": "0.0.42"
     },
     "peerDependencies": {
         "monaco-editor": "^0.20.0"

package/release/dev/kustoWorker.js

@@ -7180,7 +7180,7 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
             // Start and end relative to block start.
             var startOffset = renderStatement.TextStart;
             var endOffset = renderStatement.End;
-            var visualization = renderStatement.ChartType.ValueText;
+            var visualization = renderStatement.ChartType.Text;
             var withClause = renderStatement.WithClause;
             if (!withClause) {
                 var info = {
@@ -7327,12 +7327,21 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
                 return Promise.resolve(undefined);
             }
             var quickInfo = currentBLock.Service.GetQuickInfo(cursorOffset);
-            if (!quickInfo || !quickInfo.Text) {
+            if (!quickInfo || !quickInfo.Items) {
                 return Promise.resolve(undefined);
             }
+            var items = this.toArray(quickInfo.Items);
+            if (!items) {
+                return Promise.resolve(undefined);
+            }
+            // Errors are already shown in getDiagnostics. we don't want them in doHover.
+            items = items.filter(function (item) { return item.Kind !== k2.QuickInfoKind.Error; });
+            var itemsText = items.map(function (item) { return item.Text.replace('\n\n', '\n* * *\n'); });
+            // separate items by horizontal line.
+            var text = itemsText.join("\n* * *\n");
             // Instead of just an empty line between the first line (the signature) and the second line (the description)
             // add an horizontal line (* * * in markdown) between them.
-            return Promise.resolve({ contents: quickInfo.Text.replace('\n\n', '\n* * *\n') });
+            return Promise.resolve({ contents: text });
         };
         Object.defineProperty(KustoLanguageService, "dummySchema", {
             //#region dummy schema for manual testing
@@ -7526,7 +7535,8 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
                 var paramSymbol = Kusto.Language.Symbols.ScalarTypes.GetSymbol(schema_1.getCslTypeNameFromClrType(param.type));
                 var expression = void 0;
                 if (param.cslDefaultValue && typeof param.cslDefaultValue === "string") {
-                    expression = parsing.QueryParser.ParseLiteral$1(param.cslDefaultValue);
+                    var parser = parsing.QueryGrammar.From(Kusto.Language.GlobalState.Default).ConstantExpression;
+                    expression = parsing.SyntaxParsers.ParseFirst({ prototype: parser }, parser, param.cslDefaultValue);
                 }
                 return new sym.Parameter.$ctor3(param.name, paramSymbol, null, null, null, false, null, 1, 1, expression, null);
             }

package/release/esm/languageService/kustoLanguageService.js

@@ -918,7 +918,7 @@ var KustoLanguageService = /** @class */ (function () {
         // Start and end relative to block start.
         var startOffset = renderStatement.TextStart;
         var endOffset = renderStatement.End;
-        var visualization = renderStatement.ChartType.ValueText;
+        var visualization = renderStatement.ChartType.Text;
         var withClause = renderStatement.WithClause;
         if (!withClause) {
             var info = {
@@ -1065,12 +1065,21 @@ var KustoLanguageService = /** @class */ (function () {
             return Promise.resolve(undefined);
         }
         var quickInfo = currentBLock.Service.GetQuickInfo(cursorOffset);
-        if (!quickInfo || !quickInfo.Text) {
+        if (!quickInfo || !quickInfo.Items) {
             return Promise.resolve(undefined);
         }
+        var items = this.toArray(quickInfo.Items);
+        if (!items) {
+            return Promise.resolve(undefined);
+        }
+        // Errors are already shown in getDiagnostics. we don't want them in doHover.
+        items = items.filter(function (item) { return item.Kind !== k2.QuickInfoKind.Error; });
+        var itemsText = items.map(function (item) { return item.Text.replace('\n\n', '\n* * *\n'); });
+        // separate items by horizontal line.
+        var text = itemsText.join("\n* * *\n");
         // Instead of just an empty line between the first line (the signature) and the second line (the description)
         // add an horizontal line (* * * in markdown) between them.
-        return Promise.resolve({ contents: quickInfo.Text.replace('\n\n', '\n* * *\n') });
+        return Promise.resolve({ contents: text });
     };
     Object.defineProperty(KustoLanguageService, "dummySchema", {
         //#region dummy schema for manual testing
@@ -1264,7 +1273,8 @@ var KustoLanguageService = /** @class */ (function () {
             var paramSymbol = Kusto.Language.Symbols.ScalarTypes.GetSymbol(getCslTypeNameFromClrType(param.type));
             var expression = void 0;
             if (param.cslDefaultValue && typeof param.cslDefaultValue === "string") {
-                expression = parsing.QueryParser.ParseLiteral$1(param.cslDefaultValue);
+                var parser = parsing.QueryGrammar.From(Kusto.Language.GlobalState.Default).ConstantExpression;
+                expression = parsing.SyntaxParsers.ParseFirst({ prototype: parser }, parser, param.cslDefaultValue);
             }
             return new sym.Parameter.$ctor3(param.name, paramSymbol, null, null, null, false, null, 1, 1, expression, null);
         }