@kusto/monaco-kusto 10.0.21 → 11.0.0

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 } 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,
@@ -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.
@@ -395,10 +392,10 @@ 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 no be placed at end of suggested text.
+            // If we have AfterText it means that the cursor should not be placed at end of suggested text.
             // In that case we switch to snippet format and represent the point where the cursor should be as
             // as '\$0'
             var _a = kItem.AfterText && kItem.AfterText.length > 0
@@ -413,19 +410,13 @@ 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 = lsItem.label.charAt(0).toLowerCase() + lsItem.label.slice(1);
+            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
@@ -453,56 +444,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 +555,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 +690,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 +773,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 +787,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 +919,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 +940,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 +959,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 +1059,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 +1081,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 +1105,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 +1248,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 +1281,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 +1557,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 +1702,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 +1745,6 @@ var KustoLanguageService = /** @class */ (function () {
 }());
 var languageService = new KustoLanguageService(KustoLanguageService.dummySchema, {
     includeControlCommands: true,
-    useIntellisenseV2: true,
     useSemanticColorization: true,
     completionOptions: { includeExtendedSyntax: false },
 });

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,
@@ -181,7 +180,7 @@ function triggerSuggestDialogWhenCompletionItemSelected(editor) {
                 return;
             }
             event.selection;
-            // OK so now we in a situation where we know a suggestion was selected and we want to trigger another one.
+            // OK so now we in a situation where we know a suggestion was selected, and we want to trigger another one.
             // the only problem is that the suggestion widget itself listens to this same event in order to know it needs to close.
             // The only problem is that we're ahead in line, so we're triggering a suggest operation that will be shut down once
             // the next callback is called. This is why we're waiting here - to let all the callbacks run synchronously and be

package/release/esm/{schema-18e9c1bd.js → schema-390a6d13.js}

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 10.0.21(1a66aa7041bf94687bc1e155f25c36653c952049)
+ * monaco-kusto version: 11.0.0(2cd16f8743253b5a0133f2ba4f53203e02c1673c)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/