@kusto/monaco-kusto 5.1.0 → 5.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kusto/monaco-kusto",
-    "version": "5.1.0",
+    "version": "5.1.3",
     "description": "CSL, KQL plugin for the Monaco Editor",
     "author": {
         "name": "Microsoft"
@@ -54,8 +54,8 @@
         "xregexp": "^3.2.0"
     },
     "dependencies": {
-        "@kusto/language-service": "2.0.0-beta.0",
-        "@kusto/language-service-next": "0.0.54"
+        "@kusto/language-service": "0.0.36",
+        "@kusto/language-service-next": "0.0.55"
     },
     "peerDependencies": {
         "monaco-editor": "0.33.0"

package/release/dev/kustoWorker.js

@@ -7004,7 +7004,9 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
                 // as '\$0'
                 var _a = kItem.AfterText && kItem.AfterText.length > 0
                     ? {
-                        textToInsert: kItem.EditText + '$0' + kItem.AfterText,
+                        // Need to escape dollar sign since it is used as a placeholder in snippet.
+                        // Usually dollar sign is not a valid character in a function name, but grafana uses macros that start with dollars.
+                        textToInsert: kItem.EditText.replace('$', '\\$') + "$0" + kItem.AfterText,
                         format: ls.InsertTextFormat.Snippet,
                     }
                     : {
@@ -7225,7 +7227,8 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
                     var warningAndSuggestionDiagnostics = block.Service.GetAnalyzerDiagnostics(null, true);
                     var filterredDiagnostics = _this.toArray(warningAndSuggestionDiagnostics).filter(function (d) {
                         var _a;
-                        var allowSeverity = (enableWarnings && d.Severity === 'Warning') || (enableSuggestions && d.Severity === 'Suggestion');
+                        var allowSeverity = (enableWarnings && d.Severity === 'Warning') ||
+                            (enableSuggestions && d.Severity === 'Suggestion');
                         var allowCode = !((_a = _this._languageSettings.disabledDiagnoticCodes) === null || _a === void 0 ? void 0 : _a.includes(d.Code));
                         return allowSeverity && allowCode;
                     });
@@ -7908,7 +7911,11 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
                 return Promise.resolve(undefined);
             }
             // Errors, Warnings and Suggestions are already shown in getDiagnostics. we don't want them in doHover.
-            items = items.filter(function (item) { return item.Kind !== k2.QuickInfoKind.Error && item.Kind !== k2.QuickInfoKind.Suggestion && item.Kind !== k2.QuickInfoKind.Warning; });
+            items = items.filter(function (item) {
+                return item.Kind !== k2.QuickInfoKind.Error &&
+                    item.Kind !== k2.QuickInfoKind.Suggestion &&
+                    item.Kind !== k2.QuickInfoKind.Warning;
+            });
             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');
@@ -8562,9 +8569,9 @@ define('vs/language/kusto/kustoWorker',["require", "exports", "./languageService
             var completions = this._languageService.doComplete(document, position);
             return completions;
         };
-        KustoWorker.prototype.doValidation = function (uri, intervals) {
+        KustoWorker.prototype.doValidation = function (uri, intervals, includeWarnings, includeSuggestions) {
             var document = this._getTextDocument(uri);
-            var diagnostics = this._languageService.doValidation(document, intervals);
+            var diagnostics = this._languageService.doValidation(document, intervals, includeWarnings, includeSuggestions);
             return diagnostics;
         };
         KustoWorker.prototype.doRangeFormat = function (uri, range) {

package/release/esm/kustoWorker.js

@@ -137,9 +137,9 @@ var KustoWorker = /** @class */ (function () {
         var completions = this._languageService.doComplete(document, position);
         return completions;
     };
-    KustoWorker.prototype.doValidation = function (uri, intervals) {
+    KustoWorker.prototype.doValidation = function (uri, intervals, includeWarnings, includeSuggestions) {
         var document = this._getTextDocument(uri);
-        var diagnostics = this._languageService.doValidation(document, intervals);
+        var diagnostics = this._languageService.doValidation(document, intervals, includeWarnings, includeSuggestions);
         return diagnostics;
     };
     KustoWorker.prototype.doRangeFormat = function (uri, range) {

package/release/esm/languageService/kustoLanguageService.js

@@ -360,7 +360,9 @@ var KustoLanguageService = /** @class */ (function () {
             // as '\$0'
             var _a = kItem.AfterText && kItem.AfterText.length > 0
                 ? {
-                    textToInsert: kItem.EditText + '$0' + kItem.AfterText,
+                    // Need to escape dollar sign since it is used as a placeholder in snippet.
+                    // Usually dollar sign is not a valid character in a function name, but grafana uses macros that start with dollars.
+                    textToInsert: kItem.EditText.replace('$', '\\$') + "$0" + kItem.AfterText,
                     format: ls.InsertTextFormat.Snippet,
                 }
                 : {
@@ -581,7 +583,8 @@ var KustoLanguageService = /** @class */ (function () {
                 var warningAndSuggestionDiagnostics = block.Service.GetAnalyzerDiagnostics(null, true);
                 var filterredDiagnostics = _this.toArray(warningAndSuggestionDiagnostics).filter(function (d) {
                     var _a;
-                    var allowSeverity = (enableWarnings && d.Severity === 'Warning') || (enableSuggestions && d.Severity === 'Suggestion');
+                    var allowSeverity = (enableWarnings && d.Severity === 'Warning') ||
+                        (enableSuggestions && d.Severity === 'Suggestion');
                     var allowCode = !((_a = _this._languageSettings.disabledDiagnoticCodes) === null || _a === void 0 ? void 0 : _a.includes(d.Code));
                     return allowSeverity && allowCode;
                 });
@@ -1264,7 +1267,11 @@ var KustoLanguageService = /** @class */ (function () {
             return Promise.resolve(undefined);
         }
         // Errors, Warnings and Suggestions are already shown in getDiagnostics. we don't want them in doHover.
-        items = items.filter(function (item) { return item.Kind !== k2.QuickInfoKind.Error && item.Kind !== k2.QuickInfoKind.Suggestion && item.Kind !== k2.QuickInfoKind.Warning; });
+        items = items.filter(function (item) {
+            return item.Kind !== k2.QuickInfoKind.Error &&
+                item.Kind !== k2.QuickInfoKind.Suggestion &&
+                item.Kind !== k2.QuickInfoKind.Warning;
+        });
         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');

package/release/esm/monaco.d.ts

@@ -120,7 +120,7 @@ declare module monaco.languages.kusto {
         doDocumentFormat(uri: string): Promise<ls.TextEdit[]>;
         doRangeFormat(uri: string, range: ls.Range): Promise<ls.TextEdit[]>;
         doCurrentCommandFormat(uri: string, caretPosition: ls.Position): Promise<ls.TextEdit[]>;
-        doValidation(uri: string, intervals: { start: number; end: number }[]): Promise<ls.Diagnostic[]>;
+        doValidation(uri: string, intervals: { start: number; end: number }[], includeWarnings?: boolean, includeSuggestions?: boolean): Promise<ls.Diagnostic[]>;
         setParameters(parameters: ScalarParameter[]): void;
         /**
          * Get all the database references from the current command.