@kusto/monaco-kusto 10.0.22 → 11.1.0

package/release/esm/languageFeatures.js

@@ -46,6 +46,8 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
 import * as ls from 'vscode-languageserver-types';
 import debounce from 'lodash-es/debounce';
+import { createCompletionCacheManager } from './completionCacheManager/completionCacheManager';
+import { createCompletionFilteredText } from './languageFeatures.utils';
 var DiagnosticsAdapter = /** @class */ (function () {
     function DiagnosticsAdapter(_monacoInstance, _languageId, _worker, defaults, onSchemaChange) {
         var _this = this;
@@ -167,9 +169,9 @@ var DiagnosticsAdapter = /** @class */ (function () {
         this._monacoInstance.editor.getEditors().forEach(onEditorAdd);
     }
     DiagnosticsAdapter.prototype.getMonacoCodeActions = function (model, startOffset, endOffset, enableQuickFix) {
-        var _a;
         return __awaiter(this, void 0, void 0, function () {
             var actions, worker, resource, codeActions, _loop_1, this_1, i, state_1;
+            var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -291,8 +293,8 @@ var DiagnosticsAdapter = /** @class */ (function () {
                                 hoverMessage: {
                                     value: popupErrorHoverHeaderMessage_1 + marker.message,
                                 },
-                                className: 'squiggly-error',
-                                zIndex: 100,
+                                className: 'squiggly-error', // monaco syntax error style (red underline)
+                                zIndex: 100, // This message will be the upper most mesage in the popup
                                 overviewRuler: {
                                     // The color indication on the right ruler
                                     color: 'rgb(255, 18, 18, 0.7)',
@@ -731,9 +733,21 @@ function toTextEdit(textEdit) {
 }
 var DEFAULT_DOCS_BASE_URL = 'https://learn.microsoft.com/azure/data-explorer/kusto/query';
 var CompletionAdapter = /** @class */ (function () {
-    function CompletionAdapter(_worker, languageSettings) {
-        this._worker = _worker;
+    function CompletionAdapter(workerAccessor, languageSettings) {
+        var _this = this;
         this.languageSettings = languageSettings;
+        var getFromLanguageService = function (resource, position) { return __awaiter(_this, void 0, void 0, function () {
+            var worker;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, workerAccessor(resource)];
+                    case 1:
+                        worker = _a.sent();
+                        return [2 /*return*/, worker.doComplete(resource.toString(), position)];
+                }
+            });
+        }); };
+        this.completionCacheManager = createCompletionCacheManager(getFromLanguageService);
     }
     Object.defineProperty(CompletionAdapter.prototype, "triggerCharacters", {
         get: function () {
@@ -744,26 +758,25 @@ var CompletionAdapter = /** @class */ (function () {
     });
     CompletionAdapter.prototype.provideCompletionItems = function (model, position, context, token) {
         var _this = this;
+        var _a;
         var wordInfo = model.getWordUntilPosition(position);
         var wordRange = new monaco.Range(position.lineNumber, wordInfo.startColumn, position.lineNumber, wordInfo.endColumn);
         var resource = model.uri;
+        var word = (_a = model === null || model === void 0 ? void 0 : model.getWordAtPosition(position)) === null || _a === void 0 ? void 0 : _a.word;
         var onDidProvideCompletionItems = this.languageSettings.onDidProvideCompletionItems;
-        return this._worker(resource)
-            .then(function (worker) {
-            return worker.doComplete(resource.toString(), fromPosition(position));
-        })
+        return this.completionCacheManager
+            .getCompletionItems(word, resource, fromPosition(position))
             .then(function (info) { return (onDidProvideCompletionItems ? onDidProvideCompletionItems(info) : info); })
             .then(function (info) {
-            if (!info) {
+            if (!info)
                 return;
-            }
             var items = info.items.map(function (entry) {
                 var _a;
                 var item = {
                     label: entry.label,
                     insertText: entry.insertText,
                     sortText: entry.sortText,
-                    filterText: entry.filterText,
+                    filterText: createCompletionFilteredText(word, entry),
                     // TODO: Is this cast safe?
                     documentation: _this.formatDocLink((_a = entry.documentation) === null || _a === void 0 ? void 0 : _a.value),
                     detail: entry.detail,
@@ -781,7 +794,7 @@ var CompletionAdapter = /** @class */ (function () {
                 return item;
             });
             return {
-                isIncomplete: info.isIncomplete,
+                incomplete: true,
                 suggestions: items,
             };
         });

package/release/esm/languageFeatures.utils.d.ts

@@ -0,0 +1,2 @@
+import * as ls from 'vscode-languageserver-types';
+export declare function createCompletionFilteredText(searchWord: string | undefined, completionItem: ls.CompletionItem): string;

package/release/esm/languageFeatures.utils.js

@@ -0,0 +1,7 @@
+export function createCompletionFilteredText(searchWord, completionItem) {
+    if (!searchWord)
+        return completionItem.filterText;
+    var containedInFilterText = completionItem.filterText.toLowerCase().includes(searchWord.toLowerCase());
+    var shouldPrependSearchWord = completionItem.data.forcePrecedence && containedInFilterText;
+    return shouldPrependSearchWord ? "".concat(searchWord).concat(completionItem.filterText) : completionItem.filterText;
+}

package/release/esm/languageServiceManager/competionItemSort.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="@kusto/language-service-next/Kusto.Language.Bridge" />
+import k2 = Kusto.Language.Editor;
+export declare const createSortingText: (priority: number) => string;
+export declare function sortByMatchTextKeepingKindOrder(items: k2.CompletionItem[]): k2.CompletionItem[];

package/release/esm/languageServiceManager/competionItemSort.js

@@ -0,0 +1,25 @@
+export var createSortingText = function (priority) {
+    return priority.toString().padStart(10, '0');
+};
+export function sortByMatchTextKeepingKindOrder(items) {
+    var groupedByKind = groupContiguousByKind(items);
+    var sortedGroupedItems = sortGroupedItems(groupedByKind);
+    return sortedGroupedItems.flat();
+}
+function sortGroupedItems(groupedItems) {
+    return groupedItems.map(function (group) { return group.sort(function (i1, i2) { return i1.MatchText.localeCompare(i2.MatchText); }); });
+}
+function groupContiguousByKind(items) {
+    return items.reduce(function (result, item) {
+        var _a;
+        var lastGroup = last(result);
+        var shouldCreateNewGroup = !lastGroup || ((_a = last(lastGroup)) === null || _a === void 0 ? void 0 : _a.Kind) !== item.Kind;
+        if (shouldCreateNewGroup)
+            result.push([]);
+        last(result).push(item);
+        return result;
+    }, []);
+}
+function last(array) {
+    return array.length > 0 ? array[array.length - 1] : undefined;
+}

package/release/esm/languageServiceManager/kustoLanguageService.d.ts

@@ -14,8 +14,8 @@ import type { ClusterReference, DatabaseReference } from '../types';
 export declare enum TokenKind {
     TableToken = 2,
     TableColumnToken = 4,
-    OperatorToken = 8,
-    SubOperatorToken = 16,
+    OperatorToken = 8,// where, project, ...
+    SubOperatorToken = 16,// has, contains, ...
     CalculatedColumnToken = 32,
     StringLiteralToken = 64,
     FunctionNameToken = 128,

package/release/esm/languageServiceManager/kustoLanguageService.js

@@ -41,6 +41,7 @@ var k2 = Kusto.Language.Editor;
 var sym = Kusto.Language.Symbols;
 var GlobalState = Kusto.Language.GlobalState;
 import { getCslTypeNameFromClrType, getEntityDataTypeFromCslType } from './schema';
+import { createSortingText, sortByMatchTextKeepingKindOrder } from './competionItemSort';
 var List = System.Collections.Generic.List$1;
 function assertNever(x) {
     throw new Error('Unexpected object: ' + x);
@@ -139,7 +140,6 @@ var symbolKindToName = (_a = {},
 var KustoLanguageService = /** @class */ (function () {
     function KustoLanguageService(schema, languageSettings) {
         var _a, _b, _c, _d;
-        var _this = this;
         /**
          * Taken from:
          * https://msazure.visualstudio.com/One/_git/Azure-Kusto-Service?path=/Src/Tools/Kusto.Explorer.Control/QueryEditors/KustoScriptEditor/KustoScriptEditorControl2.xaml.cs&version=GBdev&line=2075&lineEnd=2075&lineStartColumn=9&lineEndColumn=77&lineStyle=plain&_a=contents
@@ -183,9 +183,6 @@ var KustoLanguageService = /** @class */ (function () {
             '3Dchart': k2.CompletionKind.RenderChart,
             list: k2.CompletionKind.RenderChart,
         };
-        this.isIntellisenseV2 = function () {
-            return _this._languageSettings.useIntellisenseV2 && _this._schema && _this._schema.clusterType === 'Engine';
-        };
         this.disabledCompletionItemsV1 = {
             capacity: k.OptionKind.Policy,
             callout: k.OptionKind.Policy,
@@ -272,13 +269,13 @@ var KustoLanguageService = /** @class */ (function () {
             _d[TokenKind.CommentToken] = k2.ClassificationKind.Comment,
             _d[TokenKind.PlainTextToken] = k2.ClassificationKind.PlainText,
             _d[TokenKind.DataTypeToken] = k2.ClassificationKind.Type,
-            _d[TokenKind.ControlCommandToken] = k2.ClassificationKind.PlainText,
-            _d[TokenKind.CommandPartToken] = k2.ClassificationKind.PlainText,
+            _d[TokenKind.ControlCommandToken] = k2.ClassificationKind.PlainText, // TODO ?
+            _d[TokenKind.CommandPartToken] = k2.ClassificationKind.PlainText, // TODO ?
             _d[TokenKind.QueryParametersToken] = k2.ClassificationKind.QueryParameter,
-            _d[TokenKind.CslCommandToken] = k2.ClassificationKind.Keyword,
-            _d[TokenKind.LetVariablesToken] = k2.ClassificationKind.Identifier,
+            _d[TokenKind.CslCommandToken] = k2.ClassificationKind.Keyword, // TODO ?
+            _d[TokenKind.LetVariablesToken] = k2.ClassificationKind.Identifier, // TODO ?
             _d[TokenKind.PluginToken] = k2.ClassificationKind.Function,
-            _d[TokenKind.BracketRangeToken] = k2.ClassificationKind.Keyword,
+            _d[TokenKind.BracketRangeToken] = k2.ClassificationKind.Keyword, // TODO ?
             _d[TokenKind.ClientDirectiveToken] = k2.ClassificationKind.Keyword,
             _d);
         this._schemaCache = {};
@@ -334,7 +331,7 @@ var KustoLanguageService = /** @class */ (function () {
         this.createRulesProvider(this._kustoJsSchema, this._schema.clusterType);
     };
     KustoLanguageService.prototype.doComplete = function (document, position) {
-        return this.isIntellisenseV2() ? this.doCompleteV2(document, position) : this.doCompleteV1(document, position);
+        return this.doCompleteV2(document, position);
     };
     /**
      * important: Only use during development to test Global State.
@@ -387,7 +384,8 @@ var KustoLanguageService = /** @class */ (function () {
             });
         }
         var itemsAsArray = this.toArray(completionItems.Items);
-        var items = itemsAsArray
+        var sortedArray = sortByMatchTextKeepingKindOrder(itemsAsArray);
+        var items = sortedArray
             .filter(function (item) {
             return !(item &&
                 item.MatchText &&
@@ -395,7 +393,7 @@ var KustoLanguageService = /** @class */ (function () {
                 (disabledItems[item.MatchText] === k2.CompletionKind.Unknown ||
                     disabledItems[item.MatchText] === item.Kind));
         })
-            .map(function (kItem, i) {
+            .map(function (kItem, index) {
             var v1CompletionOption = new k.CompletionOption(_this._toOptionKind[kItem.Kind] || k.OptionKind.None, kItem.DisplayText);
             var helpTopic = _this.getTopic(v1CompletionOption);
             // If we have AfterText it means that the cursor should not be placed at end of suggested text.
@@ -413,24 +411,19 @@ var KustoLanguageService = /** @class */ (function () {
                     format: ls.InsertTextFormat.PlainText,
                 }, textToInsert = _a.textToInsert, format = _a.format;
             var lsItem = ls.CompletionItem.create(kItem.DisplayText);
-            // Adding to columns a prefix to their sortText so they will appear first in the list
-            var sortTextPrefix = lsItem.kind === ls.CompletionItemKind.Field ? 0 : itemsAsArray.length;
-            var countOfWords = lsItem.label.split('_').filter(function (item) { return !!item; }).length;
-            // We always want results with multiple words to show after shorter options.
-            // For example: to show "count_distinct" after "count"
-            sortTextPrefix = sortTextPrefix * countOfWords;
             var startPosition = document.positionAt(completionItems.EditStart);
             var endPosition = document.positionAt(completionItems.EditStart + completionItems.EditLength);
             lsItem.textEdit = ls.TextEdit.replace(ls.Range.create(startPosition, endPosition), textToInsert);
-            lsItem.sortText = _this.getSortText(sortTextPrefix + i + 1);
             // Changing the first letter to be lower case, to ignore case-sensitive matching
             lsItem.filterText = kItem.MatchText.charAt(0).toLowerCase() + kItem.MatchText.slice(1);
             lsItem.kind = _this.kustoKindToLsKindV2(kItem.Kind);
+            lsItem.sortText = createSortingText(index);
             lsItem.insertTextFormat = format;
             lsItem.detail = helpTopic ? helpTopic.ShortDescription : undefined;
             lsItem.documentation = helpTopic
                 ? { value: _this.formatHelpTopic(helpTopic), kind: ls.MarkupKind.Markdown }
                 : undefined;
+            lsItem.data = { forcePrecedence: kItem.Kind === k2.CompletionKind.Column };
             return lsItem;
         });
         return Promise.resolve(ls.CompletionList.create(items));
@@ -453,56 +446,6 @@ var KustoLanguageService = /** @class */ (function () {
         }
         return k.CslDocumentation.Instance.GetTopic(completionOption);
     };
-    KustoLanguageService.prototype.doCompleteV1 = function (document, position) {
-        var _this = this;
-        // TODO: fix typing in CslCommandParser to allow rulesProvider to be query only.
-        var caretAbsolutePosition = document.offsetAt(position);
-        // find out what's the current command to only parse this one.
-        this.parseDocumentV1(document, k.ParseMode.CommandTokensOnly);
-        var currentCommand = this.getCurrentCommand(document, caretAbsolutePosition);
-        var commandTextUntilCursor = '';
-        if (currentCommand) {
-            var commandStartOffset = currentCommand.AbsoluteStart;
-            this.parseTextV1(currentCommand.Text, k.ParseMode.TokenizeAllText);
-            var caretRelativePosition = caretAbsolutePosition - currentCommand.AbsoluteStart;
-            commandTextUntilCursor = currentCommand.Text.substring(currentCommand.CslExpressionStartPosition, caretRelativePosition);
-        }
-        var commandTextWithoutLastWord = this.getCommandWithoutLastWord(commandTextUntilCursor);
-        var context = this._rulesProvider.AnalyzeCommand$1(commandTextUntilCursor, currentCommand).Context;
-        var result = { v: null };
-        this._rulesProvider.TryMatchAnyRule(commandTextWithoutLastWord, result);
-        var rule = result.v;
-        if (rule) {
-            var completionOptions = this.toArray(rule.GetCompletionOptions(context));
-            // TODO once AppendPipePolicy becomes a public static member of ApplyPolicy in our c# code, and bridge.Net transplies this,
-            //  remove the 'as any' part..
-            // Also = DefaultApplyPolicy is internal in c# code, so not exposed in d.ts, so we cast it to any.
-            if (this._languageSettings.newlineAfterPipe &&
-                rule.DefaultAfterApplyPolicy === Kusto.Data.IntelliSense.ApplyPolicy.AppendPipePolicy) {
-                rule.DefaultAfterApplyPolicy = this._newlineAppendPipePolicy;
-            }
-            var options = completionOptions
-                .filter(function (option) {
-                return !(option && option.Value && _this.disabledCompletionItemsV1[option.Value] === option.Kind);
-            })
-                .map(function (option, ordinal) {
-                var _a = _this.getTextToInsert(rule, option), insertText = _a.insertText, insertTextFormat = _a.insertTextFormat;
-                var helpTopic = k.CslDocumentation.Instance.GetTopic(option);
-                var item = ls.CompletionItem.create(option.Value);
-                item.kind = _this.kustoKindToLsKind(option.Kind);
-                item.insertText = insertText;
-                item.insertTextFormat = insertTextFormat;
-                item.sortText = _this.getSortText(ordinal + 1);
-                item.detail = helpTopic ? helpTopic.ShortDescription : undefined;
-                item.documentation = helpTopic
-                    ? { value: helpTopic.LongDescription, kind: ls.MarkupKind.Markdown }
-                    : undefined;
-                return item;
-            });
-            return Promise.resolve(ls.CompletionList.create(options));
-        }
-        return Promise.resolve(ls.CompletionList.create([]));
-    };
     KustoLanguageService.prototype.doRangeFormat = function (document, range) {
         if (!document) {
             return Promise.resolve([]);
@@ -614,7 +557,7 @@ var KustoLanguageService = /** @class */ (function () {
     KustoLanguageService.prototype.doValidation = function (document, changeIntervals, includeWarnings, includeSuggestions) {
         var _this = this;
         // didn't implement validation for v1.
-        if (!document || !this.isIntellisenseV2()) {
+        if (!document) {
             return Promise.resolve([]);
         }
         var script = this.parseDocumentV2(document);
@@ -749,59 +692,6 @@ var KustoLanguageService = /** @class */ (function () {
         if (!document || !this._languageSettings.useSemanticColorization) {
             return Promise.resolve([]);
         }
-        // V1 intellisense
-        if (!this.isIntellisenseV2()) {
-            // Handle specific ranges changes (and not the whole doc)
-            if (changeIntervals.length > 0) {
-                this.parseDocumentV1(document, k.ParseMode.CommandTokensOnly);
-                var affectedCommands = this.toArray(this._parser.Results).filter(function (command) {
-                    // a command is affected if it intersects at least on of changed ranges.
-                    return command // command can be null. we're filtering all nulls in the array.
-                        ? changeIntervals.some(function (_a) {
-                            var changeStart = _a.start, changeEnd = _a.end;
-                            // both intervals intersect if either the start or the end of interval A is inside interval B.
-                            // If we deleted something at the end of a command, the interval will not intersect the current command.
-                            // so we also want consider affected commands commands the end where the interval begins.
-                            // hence the + 1.
-                            return (command.AbsoluteStart >= changeStart && command.AbsoluteStart <= changeEnd) ||
-                                (changeStart >= command.AbsoluteStart && changeStart <= command.AbsoluteEnd + 1);
-                        })
-                        : false;
-                });
-                // We're not on any command so don't return any classifications.
-                // this can happen if we're at the and of the file and deleting empty rows (for example).
-                if (!affectedCommands || affectedCommands.length === 0) {
-                    return Promise.resolve([
-                        {
-                            classifications: [],
-                            absoluteStart: changeIntervals[0].start,
-                            absoluteEnd: changeIntervals[0].end,
-                        },
-                    ]);
-                }
-                var results = affectedCommands.map(function (command) {
-                    _this.parseTextV1(command.Text, k.ParseMode.TokenizeAllText);
-                    var k2Classifications = _this.getClassificationsFromParseResult(command.AbsoluteStart);
-                    var classifications = toClassifiedRange(k2Classifications);
-                    return {
-                        classifications: classifications,
-                        absoluteStart: command.AbsoluteStart,
-                        absoluteEnd: command.AbsoluteEnd,
-                    };
-                });
-                return Promise.resolve(results);
-            }
-            // Entire document requested
-            this.parseDocumentV1(document, k.ParseMode.TokenizeAllText);
-            var classifications_1 = this.getClassificationsFromParseResult();
-            return Promise.resolve([
-                {
-                    classifications: toClassifiedRange(classifications_1),
-                    absoluteStart: 0,
-                    absoluteEnd: document.getText().length,
-                },
-            ]);
-        }
         // V2 intellisense
         var script = this.parseDocumentV2(document);
         if (changeIntervals.length > 0) {
@@ -885,7 +775,7 @@ var KustoLanguageService = /** @class */ (function () {
     KustoLanguageService.prototype.setSchema = function (schema) {
         this._schema = schema;
         // We support intellisenseV2 only if the clusterType is "Engine", even if the setting is enabled
-        if (this._languageSettings.useIntellisenseV2 && schema && schema.clusterType === 'Engine') {
+        if (schema && schema.clusterType === 'Engine') {
             var kustoJsSchemaV2 = this.convertToKustoJsSchemaV2(schema);
             this._kustoJsSchemaV2 = kustoJsSchemaV2;
             this._script = undefined;
@@ -899,7 +789,7 @@ var KustoLanguageService = /** @class */ (function () {
     };
     KustoLanguageService.prototype.setParameters = function (scalarParameters, tabularParameters) {
         var _a;
-        if (!this._languageSettings.useIntellisenseV2 || this._schema.clusterType !== 'Engine') {
+        if (this._schema.clusterType !== 'Engine') {
             throw new Error('setParameters requires intellisense V2 and Engine cluster');
         }
         this._schema.globalScalarParameters = scalarParameters;
@@ -1031,13 +921,11 @@ var KustoLanguageService = /** @class */ (function () {
         return Promise.resolve(this._schema);
     };
     KustoLanguageService.prototype.getCommandInContext = function (document, cursorOffset) {
-        return this.isIntellisenseV2()
-            ? this.getCommandInContextV2(document, cursorOffset)
-            : this.getCommandInContextV1(document, cursorOffset);
+        return this.getCommandInContextV2(document, cursorOffset);
     };
     KustoLanguageService.prototype.getCommandAndLocationInContext = function (document, cursorOffset) {
         // We are going to remove v1 intellisense. no use to keep parity.
-        if (!document || !this.isIntellisenseV2()) {
+        if (!document) {
             return Promise.resolve(null);
         }
         var script = this.parseDocumentV2(document);
@@ -1054,14 +942,6 @@ var KustoLanguageService = /** @class */ (function () {
             location: location,
         });
     };
-    KustoLanguageService.prototype.getCommandInContextV1 = function (document, cursorOffset) {
-        this.parseDocumentV1(document, k.ParseMode.CommandTokensOnly);
-        var command = this.getCurrentCommand(document, cursorOffset);
-        if (!command) {
-            return Promise.resolve(null);
-        }
-        return Promise.resolve(command.Text);
-    };
     KustoLanguageService.prototype.getCommandInContextV2 = function (document, cursorOffset) {
         if (!document) {
             return Promise.resolve(null);
@@ -1081,9 +961,7 @@ var KustoLanguageService = /** @class */ (function () {
         if (!document) {
             return Promise.resolve([]);
         }
-        return this.isIntellisenseV2()
-            ? this.getCommandsInDocumentV2(document)
-            : this.getCommandsInDocumentV1(document);
+        return this.getCommandsInDocumentV2(document);
     };
     KustoLanguageService.prototype.getCommandsInDocumentV1 = function (document) {
         this.parseDocumentV1(document, k.ParseMode.CommandTokensOnly);
@@ -1183,7 +1061,7 @@ var KustoLanguageService = /** @class */ (function () {
         });
     };
     KustoLanguageService.prototype.findDefinition = function (document, position) {
-        if (!document || !this.isIntellisenseV2()) {
+        if (!document) {
             return Promise.resolve([]);
         }
         var script = this.parseDocumentV2(document);
@@ -1205,7 +1083,7 @@ var KustoLanguageService = /** @class */ (function () {
         return Promise.resolve([location]);
     };
     KustoLanguageService.prototype.findReferences = function (document, position) {
-        if (!document || !this.isIntellisenseV2()) {
+        if (!document) {
             return Promise.resolve([]);
         }
         var script = this.parseDocumentV2(document);
@@ -1229,10 +1107,9 @@ var KustoLanguageService = /** @class */ (function () {
         return Promise.resolve(references);
     };
     KustoLanguageService.prototype.getQueryParams = function (document, cursorOffset) {
-        if (!document || !this.isIntellisenseV2()) {
+        if (!document) {
             return Promise.resolve([]);
         }
-        var script = this.parseDocumentV2(document);
         var parsedAndAnalyzed = this.parseAndAnalyze(document, cursorOffset);
         var queryParamStatements = this.toArray(parsedAndAnalyzed.Syntax.GetDescendants(Kusto.Language.Syntax.QueryParametersStatement));
         if (!queryParamStatements || queryParamStatements.length == 0) {
@@ -1373,16 +1250,13 @@ var KustoLanguageService = /** @class */ (function () {
         return Promise.resolve(result);
     };
     KustoLanguageService.prototype.getGlobalParams = function (document) {
-        if (!this.isIntellisenseV2()) {
-            return Promise.resolve([]);
-        }
         var params = this.toArray(this._kustoJsSchemaV2.Parameters);
         var result = params.map(function (param) { return ({ name: param.Name, type: param.Type.Name }); });
         return Promise.resolve(result);
     };
     KustoLanguageService.prototype.doRename = function (document, position, newName) {
         var _a;
-        if (!document || !this.isIntellisenseV2()) {
+        if (!document) {
             return Promise.resolve(undefined);
         }
         var script = this.parseDocumentV2(document);
@@ -1409,7 +1283,7 @@ var KustoLanguageService = /** @class */ (function () {
         return Promise.resolve(workspaceEdit);
     };
     KustoLanguageService.prototype.doHover = function (document, position) {
-        if (!document || !this.isIntellisenseV2()) {
+        if (!document) {
             return Promise.resolve(undefined);
         }
         var script = this.parseDocumentV2(document);
@@ -1685,28 +1559,6 @@ var KustoLanguageService = /** @class */ (function () {
         var newRange = ls.Range.create(range.start, newEndPosition);
         return newRange;
     };
-    /**
-     * Maps numbers to strings, such that if a>b numerically, f(a)>f(b) lexicographically.
-     * 1 -> "a", 26 -> "z", 27 -> "za", 28 -> "zb", 52 -> "zz", 53 ->"zza"
-     * @param order - The number to be converted to a sorting-string. order should start at 1.
-     * @returns A string repenting the order.
-     */
-    KustoLanguageService.prototype.getSortText = function (order) {
-        if (order <= 0) {
-            throw new RangeError("order should be a number >= 1. instead got ".concat(order));
-        }
-        var sortText = '';
-        var numCharacters = 26; // "z" - "a" + 1;
-        var div = Math.floor(order / numCharacters);
-        for (var i = 0; i < div; ++i) {
-            sortText += 'z';
-        }
-        var reminder = order % numCharacters;
-        if (reminder > 0) {
-            sortText += String.fromCharCode(96 + reminder);
-        }
-        return sortText;
-    };
     /**
      * ParseTextV1 parses the given text with the given parse mode.
      * Additionally - it will make sure not to provide rules provider for non-engine clusters
@@ -1852,7 +1704,7 @@ var KustoLanguageService = /** @class */ (function () {
         return conversion || k2.ClassificationKind.PlainText;
     };
     KustoLanguageService.prototype.parseAndAnalyze = function (document, cursorOffset) {
-        if (!document || !this.isIntellisenseV2()) {
+        if (!document) {
             return undefined;
         }
         var script = this.parseDocumentV2(document);
@@ -1895,7 +1747,6 @@ var KustoLanguageService = /** @class */ (function () {
 }());
 var languageService = new KustoLanguageService(KustoLanguageService.dummySchema, {
     includeControlCommands: true,
-    useIntellisenseV2: true,
     useSemanticColorization: true,
     completionOptions: { includeExtendedSyntax: false },
 });

package/release/esm/languageServiceManager/kustoMonarchLanguageDefinition.js

@@ -6,7 +6,7 @@ export var KustoLanguageDefinition = {
     brackets: [
         ['[', ']', 'delimiter.square'],
         ['(', ')', 'delimiter.parenthesis'],
-    ],
+    ], // types are wrong
     wordDefinition: /(-?\d*\.\d\w*)|([^\`\~\!\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g,
     // .slice() call is for creating a shallow copy of the array since bridge.net shoves a $type property on the array which monaco doesn't like.
     // Kusto.Data.IntelliSense.CslCommandParser.PromotedOperatorCommandTokens.slice(0),

package/release/esm/languageServiceManager/settings.d.ts

@@ -3,7 +3,6 @@ export interface LanguageSettings {
     includeControlCommands?: boolean;
     newlineAfterPipe?: boolean;
     openSuggestionDialogAfterPreviousSuggestionAccepted?: boolean;
-    useIntellisenseV2: boolean;
     useSemanticColorization?: boolean;
     useTokenColorization?: boolean;
     disabledCompletionItems?: string[];

package/release/esm/monaco.contribution.js

@@ -53,7 +53,6 @@ var defaultLanguageSettings = {
     includeControlCommands: true,
     newlineAfterPipe: true,
     openSuggestionDialogAfterPreviousSuggestionAccepted: true,
-    useIntellisenseV2: true,
     useSemanticColorization: true,
     useTokenColorization: false,
     enableHover: true,
@@ -98,21 +97,21 @@ monaco.editor.defineTheme(themeNames.light, {
     base: 'vs',
     inherit: true,
     rules: [
-        { token: 'comment', foreground: '008000' },
-        { token: 'variable.predefined', foreground: '800080' },
-        { token: 'function', foreground: '0000FF' },
-        { token: 'operator.sql', foreground: 'CC3700' },
-        { token: 'string', foreground: 'B22222' },
-        { token: 'operator.scss', foreground: '0000FF' },
-        { token: 'variable', foreground: 'C71585' },
-        { token: 'variable.parameter', foreground: '9932CC' },
-        { token: '', foreground: '000000' },
-        { token: 'type', foreground: '0000FF' },
-        { token: 'tag', foreground: '0000FF' },
-        { token: 'annotation', foreground: '2B91AF' },
-        { token: 'keyword', foreground: '0000FF' },
-        { token: 'number', foreground: '191970' },
-        { token: 'annotation', foreground: '9400D3' },
+        { token: 'comment', foreground: '008000' }, // CommentToken Green
+        { token: 'variable.predefined', foreground: '800080' }, // CalculatedColumnToken Purple
+        { token: 'function', foreground: '0000FF' }, // FunctionNameToken Blue
+        { token: 'operator.sql', foreground: 'CC3700' }, // _WAS_ OperatorToken OrangeRed, but wasn't accessible.
+        { token: 'string', foreground: 'B22222' }, // StringLiteralToken Firebrick
+        { token: 'operator.scss', foreground: '0000FF' }, // SubOperatorToken Blue
+        { token: 'variable', foreground: 'C71585' }, // TableColumnToken MediumVioletRed
+        { token: 'variable.parameter', foreground: '9932CC' }, // TableToken DarkOrchid
+        { token: '', foreground: '000000' }, // UnknownToken, PlainTextToken  Black
+        { token: 'type', foreground: '0000FF' }, // DataTypeToken Blue
+        { token: 'tag', foreground: '0000FF' }, // ControlCommandToken Blue
+        { token: 'annotation', foreground: '2B91AF' }, // QueryParametersToken FF2B91AF
+        { token: 'keyword', foreground: '0000FF' }, // CslCommandToken, PluginToken Blue
+        { token: 'number', foreground: '191970' }, // LetVariablesToken MidnightBlue
+        { token: 'annotation', foreground: '9400D3' }, // ClientDirectiveToken DarkViolet
         { token: 'invalid', background: 'cd3131' },
     ],
     colors: {},
@@ -121,21 +120,21 @@ monaco.editor.defineTheme(themeNames.dark, {
     base: 'vs-dark',
     inherit: true,
     rules: [
-        { token: 'comment', foreground: '608B4E' },
-        { token: 'variable.predefined', foreground: '4ec9b0' },
-        { token: 'function', foreground: 'dcdcaa' },
-        { token: 'operator.sql', foreground: '9cdcfe' },
-        { token: 'string', foreground: 'ce9178' },
-        { token: 'operator.scss', foreground: '569cd6' },
-        { token: 'variable', foreground: '4ec9b0' },
-        { token: 'variable.parameter', foreground: 'c586c0' },
-        { token: '', foreground: 'd4d4d4' },
-        { token: 'type', foreground: '569cd6' },
-        { token: 'tag', foreground: '569cd6' },
-        { token: 'annotation', foreground: '9cdcfe' },
-        { token: 'keyword', foreground: '569cd6' },
-        { token: 'number', foreground: 'd7ba7d' },
-        { token: 'annotation', foreground: 'b5cea8' },
+        { token: 'comment', foreground: '608B4E' }, // CommentToken Green
+        { token: 'variable.predefined', foreground: '4ec9b0' }, // CalculatedColumnToken Purple
+        { token: 'function', foreground: 'dcdcaa' }, // FunctionNameToken Blue
+        { token: 'operator.sql', foreground: '9cdcfe' }, // OperatorToken OrangeRed
+        { token: 'string', foreground: 'ce9178' }, // StringLiteralToken Firebrick
+        { token: 'operator.scss', foreground: '569cd6' }, // SubOperatorToken Blue
+        { token: 'variable', foreground: '4ec9b0' }, // TableColumnToken MediumVioletRed
+        { token: 'variable.parameter', foreground: 'c586c0' }, // TableToken DarkOrchid
+        { token: '', foreground: 'd4d4d4' }, // UnknownToken, PlainTextToken  Black
+        { token: 'type', foreground: '569cd6' }, // DataTypeToken Blue
+        { token: 'tag', foreground: '569cd6' }, // ControlCommandToken Blue
+        { token: 'annotation', foreground: '9cdcfe' }, // QueryParametersToken FF2B91AF
+        { token: 'keyword', foreground: '569cd6' }, // CslCommandToken, PluginToken Blue
+        { token: 'number', foreground: 'd7ba7d' }, // LetVariablesToken MidnightBlue
+        { token: 'annotation', foreground: 'b5cea8' }, // ClientDirectiveToken DarkViolet
         { token: 'invalid', background: 'cd3131' },
     ],
     colors: {
@@ -148,7 +147,7 @@ monaco.editor.defineTheme(themeNames.dark2, {
     rules: [],
     colors: {
         // see: https://code.visualstudio.com/api/references/theme-color#editor-widget-colors
-        'editor.background': '#1B1A19',
+        'editor.background': '#1B1A19', // gray 200
         'editorSuggestWidget.selectedBackground': '#004E8C',
     },
 });