@kusto/monaco-kusto 5.2.0 → 5.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kusto/monaco-kusto",
-    "version": "5.2.0",
+    "version": "5.3.0",
     "description": "CSL, KQL plugin for the Monaco Editor",
     "author": {
         "name": "Microsoft"
@@ -41,7 +41,7 @@
         "lodash": "^4.17.4",
         "merge-stream": "1.0.0",
         "minimatch": "^3.0.4",
-        "monaco-editor-core": "0.33.0",
+        "monaco-editor-core": "0.34.1",
         "monaco-languages": "2.11.1",
         "monaco-plugin-helpers": "^1.0.3",
         "object-assign": "4.1.0",
@@ -54,11 +54,11 @@
         "xregexp": "^3.2.0"
     },
     "dependencies": {
-        "@kusto/language-service": "0.0.36",
-        "@kusto/language-service-next": "0.0.57"
+        "@kusto/language-service": "0.0.38",
+        "@kusto/language-service-next": "0.0.59"
     },
     "peerDependencies": {
-        "monaco-editor": "0.33.0"
+        "monaco-editor": "0.34.1"
     },
     "jest": {
         "rootDir": "src",

package/release/dev/kustoMode.js

@@ -2941,10 +2941,11 @@ define('vs/language/kusto/languageFeatures',["require", "exports", "vscode-langu
                 var e = _a[_i];
                 resourceEdits.push({
                     resource: _uri,
-                    edit: {
+                    textEdit: {
                         range: toRange(e.range),
                         text: e.newText,
                     },
+                    versionId: undefined,
                 });
             }
         }

package/release/dev/kustoWorker.js

@@ -6785,6 +6785,7 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
                 _a[k2.CompletionKind.Unknown] = k.OptionKind.None,
                 _a[k2.CompletionKind.Variable] = k.OptionKind.Parameter,
                 _a[k2.CompletionKind.Option] = k.OptionKind.Option,
+                _a[k2.CompletionKind.Graph] = k.OptionKind.Graph,
                 _a);
             this.disabledCompletionItemsV2 = {
                 // render charts
@@ -6869,6 +6870,7 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
                 _c[k2.CompletionKind.Unknown] = ls.CompletionItemKind.Interface,
                 _c[k2.CompletionKind.Variable] = ls.CompletionItemKind.Variable,
                 _c[k2.CompletionKind.Option] = ls.CompletionItemKind.Text,
+                _c[k2.CompletionKind.Graph] = ls.CompletionItemKind.Class,
                 _c);
             this._tokenKindToClassificationKind = (_d = {},
                 _d[TokenKind.TableToken] = k2.ClassificationKind.Table,
@@ -7224,7 +7226,7 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
                 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 warningAndSuggestionDiagnostics = block.Service.GetAnalyzerDiagnostics(true);
                     var filterredDiagnostics = _this.toArray(warningAndSuggestionDiagnostics).filter(function (d) {
                         var _a;
                         var allowSeverity = (enableWarnings && d.Severity === 'Warning') ||
@@ -8104,7 +8106,7 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
             return "let " + fn.name + " = " + signature + " " + fn.body;
         };
         KustoLanguageService.createColumnSymbol = function (col) {
-            return new sym.ColumnSymbol(col.name, sym.ScalarTypes.GetSymbol(schema_1.getCslTypeNameFromClrType(col.type)), col.docstring);
+            return new sym.ColumnSymbol(col.name, sym.ScalarTypes.GetSymbol(schema_1.getCslTypeNameFromClrType(col.type)), col.docstring, null);
         };
         KustoLanguageService.createParameterSymbol = function (param) {
             var paramSymbol = Kusto.Language.Symbols.ScalarTypes.GetSymbol(schema_1.getCslTypeNameFromClrType(param.type));

package/release/dev/monaco.contribution.js

@@ -312,7 +312,9 @@ define('vs/language/kusto/monaco.contribution',["require", "exports", "./command
                     kustoDefaults.languageSettings &&
                     kustoDefaults.languageSettings.openSuggestionDialogAfterPreviousSuggestionAccepted) {
                     var didAcceptSuggestion = event.source === 'snippet' && event.reason === monaco.editor.CursorChangeReason.NotSet;
-                    if (!didAcceptSuggestion) {
+                    // If the word at the current position is not null - meaning we did not add a space after completion.
+                    // In this case we don't want to activate the eager mode, since it will display the current selected word..
+                    if (!didAcceptSuggestion || editor.getModel().getWordAtPosition(event.selection.getPosition()) !== null) {
                         return;
                     }
                     event.selection;

package/release/esm/languageFeatures.js

@@ -684,10 +684,11 @@ function toWorkspaceEdit(edit) {
             var e = _a[_i];
             resourceEdits.push({
                 resource: _uri,
-                edit: {
+                textEdit: {
                     range: toRange(e.range),
                     text: e.newText,
                 },
+                versionId: undefined,
             });
         }
     }

package/release/esm/languageService/kustoLanguageService.js

@@ -141,6 +141,7 @@ var KustoLanguageService = /** @class */ (function () {
             _a[k2.CompletionKind.Unknown] = k.OptionKind.None,
             _a[k2.CompletionKind.Variable] = k.OptionKind.Parameter,
             _a[k2.CompletionKind.Option] = k.OptionKind.Option,
+            _a[k2.CompletionKind.Graph] = k.OptionKind.Graph,
             _a);
         this.disabledCompletionItemsV2 = {
             // render charts
@@ -225,6 +226,7 @@ var KustoLanguageService = /** @class */ (function () {
             _c[k2.CompletionKind.Unknown] = ls.CompletionItemKind.Interface,
             _c[k2.CompletionKind.Variable] = ls.CompletionItemKind.Variable,
             _c[k2.CompletionKind.Option] = ls.CompletionItemKind.Text,
+            _c[k2.CompletionKind.Graph] = ls.CompletionItemKind.Class,
             _c);
         this._tokenKindToClassificationKind = (_d = {},
             _d[TokenKind.TableToken] = k2.ClassificationKind.Table,
@@ -580,7 +582,7 @@ var KustoLanguageService = /** @class */ (function () {
             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 warningAndSuggestionDiagnostics = block.Service.GetAnalyzerDiagnostics(true);
                 var filterredDiagnostics = _this.toArray(warningAndSuggestionDiagnostics).filter(function (d) {
                     var _a;
                     var allowSeverity = (enableWarnings && d.Severity === 'Warning') ||
@@ -1460,7 +1462,7 @@ var KustoLanguageService = /** @class */ (function () {
         return "let " + fn.name + " = " + signature + " " + fn.body;
     };
     KustoLanguageService.createColumnSymbol = function (col) {
-        return new sym.ColumnSymbol(col.name, sym.ScalarTypes.GetSymbol(getCslTypeNameFromClrType(col.type)), col.docstring);
+        return new sym.ColumnSymbol(col.name, sym.ScalarTypes.GetSymbol(getCslTypeNameFromClrType(col.type)), col.docstring, null);
     };
     KustoLanguageService.createParameterSymbol = function (param) {
         var paramSymbol = Kusto.Language.Symbols.ScalarTypes.GetSymbol(getCslTypeNameFromClrType(param.type));

package/release/esm/monaco.contribution.js

@@ -169,7 +169,9 @@ export function setupMonacoKusto(monacoInstance) {
                 kustoDefaults.languageSettings &&
                 kustoDefaults.languageSettings.openSuggestionDialogAfterPreviousSuggestionAccepted) {
                 var didAcceptSuggestion = event.source === 'snippet' && event.reason === monaco.editor.CursorChangeReason.NotSet;
-                if (!didAcceptSuggestion) {
+                // If the word at the current position is not null - meaning we did not add a space after completion.
+                // In this case we don't want to activate the eager mode, since it will display the current selected word..
+                if (!didAcceptSuggestion || editor.getModel().getWordAtPosition(event.selection.getPosition()) !== null) {
                     return;
                 }
                 event.selection;