@kusto/monaco-kusto 4.1.8 → 5.1.1

package/release/esm/commandFormatter.js

@@ -6,7 +6,7 @@ var KustoCommandFormatter = /** @class */ (function () {
         // selection also represents no selection - for example the event gets triggered when moving cursor from point
         // a to point b. in the case start position will equal end position.
         editor.onDidChangeCursorSelection(function (changeEvent) {
-            if (_this.editor.getModel().getModeId() !== 'kusto') {
+            if (_this.editor.getModel().getLanguageId() !== 'kusto') {
                 return;
             }
             // Theoretically you would expect this code to run only once in onDidCreateEditor.
@@ -19,11 +19,13 @@ var KustoCommandFormatter = /** @class */ (function () {
                 editor.addAction({
                     id: 'editor.action.kusto.formatCurrentCommand',
                     label: 'Format Command Under Cursor',
-                    keybindings: [monaco.KeyMod.chord(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KEY_K, monaco.KeyMod.CtrlCmd | monaco.KeyCode.KEY_F)],
+                    keybindings: [
+                        monaco.KeyMod.chord(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyK, monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyF),
+                    ],
                     run: function (ed) {
                         editor.trigger('KustoCommandFormatter', 'editor.action.formatSelection', null);
                     },
-                    contextMenuGroupId: '1_modification'
+                    contextMenuGroupId: '1_modification',
                 });
                 _this.actionAdded = true;
             }

package/release/esm/commandHighlighter.js

@@ -14,7 +14,7 @@ var KustoCommandHighlighter = /** @class */ (function () {
         // Note that selection update is triggered not only for selection changes, but also just when no text selection is occuring and cursor just moves around.
         // This case is counted as a 0-length selection starting and ending on the cursor position.
         this.editor.onDidChangeCursorSelection(function (changeEvent) {
-            if (_this.editor.getModel().getModeId() !== 'kusto') {
+            if (_this.editor.getModel().getLanguageId() !== 'kusto') {
                 return;
             }
             _this.highlightCommandUnderCursor(changeEvent);
@@ -34,14 +34,18 @@ var KustoCommandHighlighter = /** @class */ (function () {
             return;
         }
         var commandRange = this.editor.getCurrentCommandRange(changeEvent.selection.getStartPosition());
-        var decorations = [{
+        var decorations = [
+            {
                 range: commandRange,
-                options: KustoCommandHighlighter.CURRENT_COMMAND_HIGHLIGHT
-            }];
+                options: KustoCommandHighlighter.CURRENT_COMMAND_HIGHLIGHT,
+            },
+        ];
         this.decorations = this.editor.deltaDecorations(this.decorations, decorations);
     };
     KustoCommandHighlighter.ID = 'editor.contrib.kustoCommandHighliter';
-    KustoCommandHighlighter.CURRENT_COMMAND_HIGHLIGHT = { className: 'selectionHighlight' };
+    KustoCommandHighlighter.CURRENT_COMMAND_HIGHLIGHT = {
+        className: 'selectionHighlight',
+    };
     return KustoCommandHighlighter;
 }());
 export default KustoCommandHighlighter;

package/release/esm/languageFeatures.js

@@ -16,20 +16,20 @@ var DiagnosticsAdapter = /** @class */ (function () {
         this._configurationListener = Object.create(null);
         this._schemaListener = Object.create(null);
         var onModelAdd = function (model) {
-            var modeId = model.getModeId();
-            if (modeId !== _this._languageId) {
+            var languageId = model.getLanguageId();
+            if (languageId !== _this._languageId) {
                 return;
             }
-            var debouncedValidation = _.debounce(function (intervals) { return _this._doValidate(model, modeId, intervals); }, 500);
+            var debouncedValidation = _.debounce(function (intervals) { return _this._doValidate(model, languageId, intervals); }, 500);
             _this._contentListener[model.uri.toString()] = model.onDidChangeContent(function (e) {
                 var intervalsToValidate = changeEventToIntervals(e);
                 debouncedValidation(intervalsToValidate);
             });
             _this._configurationListener[model.uri.toString()] = _this.defaults.onDidChange(function () {
-                self.setTimeout(function () { return _this._doValidate(model, modeId, []); }, 0);
+                self.setTimeout(function () { return _this._doValidate(model, languageId, []); }, 0);
             });
             _this._schemaListener[model.uri.toString()] = onSchemaChange(function () {
-                self.setTimeout(function () { return _this._doValidate(model, modeId, []); }, 0);
+                self.setTimeout(function () { return _this._doValidate(model, languageId, []); }, 0);
             });
         };
         var onModelRemoved = function (model) {
@@ -89,20 +89,21 @@ var DiagnosticsAdapter = /** @class */ (function () {
             }
             var markers = diagnostics.map(function (d) { return toDiagnostics(resource, d); });
             var model = _this._monacoInstance.editor.getModel(resource);
-            var oldDecorations = model.getAllDecorations()
-                .filter(function (decoration) { return decoration.options.className == "squiggly-error"; })
+            var oldDecorations = model
+                .getAllDecorations()
+                .filter(function (decoration) { return decoration.options.className == 'squiggly-error'; })
                 .map(function (decoration) { return decoration.id; });
-            if (model && model.getModeId() === languageId) {
+            if (model && model.getLanguageId() === languageId) {
                 var syntaxErrorAsMarkDown = _this.defaults.languageSettings.syntaxErrorAsMarkDown;
                 if (!syntaxErrorAsMarkDown || !syntaxErrorAsMarkDown.enableSyntaxErrorAsMarkDown) {
-                    // Remove previous syntax error decorations and set the new markers (for example, when disabling syntaxErrorAsMarkDown after it was enabled)                
+                    // Remove previous syntax error decorations and set the new markers (for example, when disabling syntaxErrorAsMarkDown after it was enabled)
                     model.deltaDecorations(oldDecorations, []);
                     _this._monacoInstance.editor.setModelMarkers(model, languageId, markers);
                 }
                 else {
                     // Add custom popup for syntax error: icon, header and message as markdown
-                    var header = syntaxErrorAsMarkDown.header ? "**" + syntaxErrorAsMarkDown.header + "** \n\n" : "";
-                    var icon = syntaxErrorAsMarkDown.icon ? "![](" + syntaxErrorAsMarkDown.icon + ")" : "";
+                    var header = syntaxErrorAsMarkDown.header ? "**" + syntaxErrorAsMarkDown.header + "** \n\n" : '';
+                    var icon = syntaxErrorAsMarkDown.icon ? "![](" + syntaxErrorAsMarkDown.icon + ")" : '';
                     var popupErrorHoverHeaderMessage_1 = icon + " " + header;
                     var newDecorations = markers.map(function (marker) {
                         return {
@@ -110,30 +111,31 @@ var DiagnosticsAdapter = /** @class */ (function () {
                                 startLineNumber: marker.startLineNumber,
                                 startColumn: marker.startColumn,
                                 endLineNumber: marker.endLineNumber,
-                                endColumn: marker.endColumn
+                                endColumn: marker.endColumn,
                             },
                             options: {
                                 hoverMessage: {
-                                    value: popupErrorHoverHeaderMessage_1 + marker.message
+                                    value: popupErrorHoverHeaderMessage_1 + marker.message,
                                 },
-                                className: "squiggly-error",
+                                className: 'squiggly-error',
                                 zIndex: 100,
                                 overviewRuler: {
                                     // The color indication on the right ruler
-                                    color: "rgb(255, 18, 18, 0.7)",
-                                    position: monaco.editor.OverviewRulerLane.Right
+                                    color: 'rgb(255, 18, 18, 0.7)',
+                                    position: monaco.editor.OverviewRulerLane.Right,
                                 },
                                 minimap: {
-                                    color: "rgb(255, 18, 18, 0.7)",
-                                    position: monaco.editor.MinimapPosition.Inline
-                                }
-                            }
+                                    color: 'rgb(255, 18, 18, 0.7)',
+                                    position: monaco.editor.MinimapPosition.Inline,
+                                },
+                            },
                         };
                     });
-                    var oldMarkers = monaco.editor.getModelMarkers({
+                    var oldMarkers = monaco.editor
+                        .getModelMarkers({
                         owner: languageId,
-                        resource: resource
-                    }).filter(function (marker) { return marker.severity == monaco.MarkerSeverity.Error; });
+                        resource: resource,
+                    });
                     if (oldMarkers && oldMarkers.length > 0) {
                         // In case there were previous markers, remove their decorations (for example, when enabling syntaxErrorAsMarkDown after it was disabled)
                         oldDecorations = [];
@@ -280,11 +282,11 @@ var ColorizationAdapter = /** @class */ (function () {
         this.decorations = [];
         injectCss();
         var onModelAdd = function (model) {
-            var modeId = model.getModeId();
-            if (modeId !== _this._languageId) {
+            var languageId = model.getLanguageId();
+            if (languageId !== _this._languageId) {
                 return;
             }
-            var debouncedColorization = _.debounce(function (intervals) { return _this._doColorization(model, modeId, intervals); }, 500);
+            var debouncedColorization = _.debounce(function (intervals) { return _this._doColorization(model, languageId, intervals); }, 500);
             var handle;
             _this._contentListener[model.uri.toString()] = model.onDidChangeContent(function (e) {
                 // Changes are represented as a range in doc before change, plus the text that it was replaced with.
@@ -294,10 +296,10 @@ var ColorizationAdapter = /** @class */ (function () {
                 debouncedColorization(intervalsToColorize);
             });
             _this._configurationListener[model.uri.toString()] = defaults.onDidChange(function () {
-                self.setTimeout(function () { return _this._doColorization(model, modeId, []); }, 0);
+                self.setTimeout(function () { return _this._doColorization(model, languageId, []); }, 0);
             });
             _this._schemaListener[model.uri.toString()] = onSchemaChange(function () {
-                self.setTimeout(function () { return _this._doColorization(model, modeId, []); }, 0);
+                self.setTimeout(function () { return _this._doColorization(model, languageId, []); }, 0);
             });
         };
         var onModelRemoved = function (model) {
@@ -395,7 +397,7 @@ var ColorizationAdapter = /** @class */ (function () {
                 .reduce(function (prev, curr) { return prev.concat(curr); }, []);
             // Flatten decoration groups to an array of decorations
             var newDecorations = decorationRanges.reduce(function (prev, next) { return prev.concat(next.decorations); }, []);
-            if (model && model.getModeId() === languageId) {
+            if (model && model.getLanguageId() === languageId) {
                 _this.decorations = model.deltaDecorations(oldDecorations, newDecorations);
             }
         })
@@ -553,8 +555,7 @@ var CompletionAdapter = /** @class */ (function () {
         var wordInfo = model.getWordUntilPosition(position);
         var wordRange = new Range(position.lineNumber, wordInfo.startColumn, position.lineNumber, wordInfo.endColumn);
         var resource = model.uri;
-        var onDidProvideCompletionItems = this.languageSettings
-            .onDidProvideCompletionItems;
+        var onDidProvideCompletionItems = this.languageSettings.onDidProvideCompletionItems;
         return this._worker(resource)
             .then(function (worker) {
             return worker.doComplete(resource.toString(), fromPosition(position));

package/release/esm/languageService/kustoLanguageService.js

@@ -96,7 +96,6 @@ function toClassifiedRange(k2Classifications) {
         kind: classification.Kind,
     }); });
 }
-;
 /**
  * Kusto Language service translates the kusto object model (transpiled from C# by Bridge.Net)
  * to the vscode language server types, which are used by vscode language extensions.
@@ -253,7 +252,7 @@ var KustoLanguageService = /** @class */ (function () {
         this.__kustoJsSchemaV2 = this.convertToKustoJsSchemaV2(schema);
         this._schema = schema;
         this._clustersSetInGlobalState = new Set();
-        this._nonEmptyDatabaseSetInGlobalState = new Set(); // used to remove clusters that are already in the global state 
+        this._nonEmptyDatabaseSetInGlobalState = new Set(); // used to remove clusters that are already in the global state
         this.configure(languageSettings);
         this._newlineAppendPipePolicy = new Kusto.Data.IntelliSense.ApplyPolicy();
         this._newlineAppendPipePolicy.Text = '\n| ';
@@ -275,13 +274,14 @@ var KustoLanguageService = /** @class */ (function () {
             this.__kustoJsSchemaV2 = globalState;
             this._clustersSetInGlobalState.clear();
             this._nonEmptyDatabaseSetInGlobalState.clear();
-            // create 2 Sets with cluster names and database names based on the updated Global State. 
+            // create 2 Sets with cluster names and database names based on the updated Global State.
             for (var i = 0; i < globalState.Clusters.Count; i++) {
                 var clusterSymbol = this._kustoJsSchemaV2.Clusters.getItem(i);
                 this._clustersSetInGlobalState.add(clusterSymbol.Name);
                 for (var i2 = 0; i2 < clusterSymbol.Databases.Count; i2++) {
                     var databaseSymbol = clusterSymbol.Databases.getItem(i2);
-                    if (databaseSymbol.Tables.Count > 0) { // only include database with tables
+                    if (databaseSymbol.Tables.Count > 0) {
+                        // only include database with tables
                         this._nonEmptyDatabaseSetInGlobalState.add(this.createDatabaseUniqueName(clusterSymbol.Name, databaseSymbol.Name));
                     }
                 }
@@ -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,
                 }
                 : {
@@ -372,6 +374,7 @@ var KustoLanguageService = /** @class */ (function () {
             var endPosition = document.positionAt(completionItems.EditStart + completionItems.EditLength);
             lsItem.textEdit = ls.TextEdit.replace(ls.Range.create(startPosition, endPosition), textToInsert);
             lsItem.sortText = _this.getSortText(i + 1);
+            // lsItem.filterText = lsItem.sortText;
             lsItem.kind = _this.kustoKindToLsKindV2(kItem.Kind);
             lsItem.insertTextFormat = format;
             lsItem.detail = helpTopic ? helpTopic.ShortDescription : undefined;
@@ -511,7 +514,7 @@ var KustoLanguageService = /** @class */ (function () {
             return Promise.resolve([]);
         }
         var newClustersReferences = [];
-        var newClustersReferencesSet = new Set(); // used to remove duplicates        
+        var newClustersReferencesSet = new Set(); // used to remove duplicates
         // Keep only unique clusters that aren't already exist in the Global State
         for (var i = 0; i < clusterReferences.Count; i++) {
             var clusterReference = clusterReferences.getItem(i);
@@ -521,7 +524,7 @@ var KustoLanguageService = /** @class */ (function () {
                 continue;
             }
             newClustersReferencesSet.add(clusterHostName);
-            // ignore references that are already in the GlobalState.            
+            // ignore references that are already in the GlobalState.
             if (!this._clustersSetInGlobalState.has(clusterHostName)) {
                 newClustersReferences.push({ clusterName: clusterHostName });
             }
@@ -552,13 +555,13 @@ var KustoLanguageService = /** @class */ (function () {
             if (!foundInGlobalState) {
                 newDatabasesReferences.push({
                     databaseName: databaseReference.Database,
-                    clusterName: databaseReference.Cluster
+                    clusterName: databaseReference.Cluster,
                 });
             }
         }
         return Promise.resolve(newDatabasesReferences);
     };
-    KustoLanguageService.prototype.doValidation = function (document, changeIntervals) {
+    KustoLanguageService.prototype.doValidation = function (document, changeIntervals, includeWarnings, includeSuggestions) {
         var _this = this;
         // didn't implement validation for v1.
         if (!document || !this.isIntellisenseV2()) {
@@ -571,11 +574,23 @@ var KustoLanguageService = /** @class */ (function () {
         }
         var diagnostics = blocks
             .map(function (block) {
-            var diagnostics = _this.toArray(block.Service.GetDiagnostics());
-            if (diagnostics) {
-                return diagnostics;
+            // GetDiagnostics returns the errors in the block
+            var diagnostics = _this.toArray(block.Service.GetDiagnostics(false));
+            var enableWarnings = includeWarnings !== null && includeWarnings !== void 0 ? includeWarnings : _this._languageSettings.enableQueryWarnings;
+            var enableSuggestions = includeSuggestions !== null && includeSuggestions !== void 0 ? includeSuggestions : _this._languageSettings.enableQuerySuggestions;
+            if (enableWarnings || enableSuggestions) {
+                // Concat Warnings and suggestions to the diagnostics
+                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 allowCode = !((_a = _this._languageSettings.disabledDiagnoticCodes) === null || _a === void 0 ? void 0 : _a.includes(d.Code));
+                    return allowSeverity && allowCode;
+                });
+                diagnostics = diagnostics.concat(filterredDiagnostics);
             }
-            return [];
+            return diagnostics;
         })
             .reduce(function (prev, curr) { return prev.concat(curr); }, []);
         var lsDiagnostics = this.toLsDiagnostics(diagnostics, document);
@@ -588,7 +603,18 @@ var KustoLanguageService = /** @class */ (function () {
             var start = document.positionAt(diag.Start);
             var end = document.positionAt(diag.Start + diag.Length);
             var range = ls.Range.create(start, end);
-            return ls.Diagnostic.create(range, diag.Message, ls.DiagnosticSeverity.Error);
+            var severity;
+            switch (diag.Severity) {
+                case 'Suggestion':
+                    severity = ls.DiagnosticSeverity.Information;
+                    break;
+                case 'Warning':
+                    severity = ls.DiagnosticSeverity.Warning;
+                    break;
+                default:
+                    severity = ls.DiagnosticSeverity.Error;
+            }
+            return ls.Diagnostic.create(range, diag.Message, severity, diag.Code);
         });
     };
     /**
@@ -711,8 +737,7 @@ var KustoLanguageService = /** @class */ (function () {
             });
         }
         if (!cluster) {
-            var databaseSymbols = databaseNames
-                .map(function (databaseName) {
+            var databaseSymbols = databaseNames.map(function (databaseName) {
                 var symbol = new sym.DatabaseSymbol.$ctor1(databaseName, undefined, false);
                 return symbol;
             });
@@ -788,16 +813,18 @@ var KustoLanguageService = /** @class */ (function () {
                 name: Name,
                 minorVersion: MinorVersion,
                 majorVersion: MajorVersion,
-                tables: [].concat.apply([], [[Tables, 'Table'], [MaterializedViews, 'MaterializedView'], [ExternalTables, 'ExternalTable']]
+                tables: [].concat.apply([], [
+                    [Tables, 'Table'],
+                    [MaterializedViews, 'MaterializedView'],
+                    [ExternalTables, 'ExternalTable'],
+                ]
                     .filter(function (_a) {
                     var tableContainer = _a[0];
                     return tableContainer;
                 })
                     .map(function (_a) {
                     var tableContainer = _a[0], tableEntity = _a[1];
-                    return Object
-                        .values(tableContainer)
-                        .map(function (_a) {
+                    return Object.values(tableContainer).map(function (_a) {
                         var Name = _a.Name, OrderedColumns = _a.OrderedColumns, DocString = _a.DocString;
                         return ({
                             name: Name,
@@ -1239,8 +1266,12 @@ var KustoLanguageService = /** @class */ (function () {
         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; });
+        // 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;
+        });
         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.contribution.js

@@ -59,6 +59,9 @@ var defaultLanguageSettings = {
     syntaxErrorAsMarkDown: {
         enableSyntaxErrorAsMarkDown: false,
     },
+    enableQueryWarnings: false,
+    enableQuerySuggestions: false,
+    disabledDiagnoticCodes: [],
 };
 function getKustoWorker() {
     return new Promise(function (resolve, reject) {
@@ -111,11 +114,7 @@ export function setupMonacoKusto(monacoInstance) {
             { token: 'annotation', foreground: '9400D3' },
             { token: 'invalid', background: 'cd3131' },
         ],
-        colors: {
-            // see: https://code.visualstudio.com/api/references/theme-color#editor-widget-colors
-            'editorSuggestWidget.selectedBackground': '#93CFFB',
-            'editorSuggestWidget.background': '#FAF9F8',
-        },
+        colors: {},
     });
     monacoInstance.editor.defineTheme('kusto-dark', {
         base: 'vs-dark',
@@ -139,9 +138,7 @@ export function setupMonacoKusto(monacoInstance) {
             { token: 'invalid', background: 'cd3131' },
         ],
         colors: {
-            // see: https://code.visualstudio.com/api/references/theme-color#editor-widget-colors
-            'editor.background': '#1B1A19',
-            'editorSuggestWidget.selectedBackground': '#004E8C',
+        // see: https://code.visualstudio.com/api/references/theme-color#editor-widget-colors
         },
     });
     monacoInstance.editor.defineTheme('kusto-dark2', {

package/release/esm/monaco.d.ts

@@ -23,6 +23,9 @@ declare module monaco.languages.kusto {
         onDidProvideCompletionItems?: monaco.languages.kusto.OnDidProvideCompletionItems;
         enableHover?: boolean;
         formatter?: FormatterOptions;
+        enableQueryWarnings?: boolean;
+        enableQuerySuggestions?: boolean;
+        disabledDiagnoticCodes?: string[];
     }
 
     export interface SyntaxErrorAsMarkDownOptions {