@kusto/monaco-kusto 5.3.11 → 5.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kusto/monaco-kusto",
-    "version": "5.3.11",
+    "version": "5.4.0",
     "description": "CSL, KQL plugin for the Monaco Editor",
     "author": {
         "name": "Microsoft"
@@ -54,8 +54,8 @@
         "xregexp": "^3.2.0"
     },
     "dependencies": {
-        "@kusto/language-service": "0.0.39",
-        "@kusto/language-service-next": "0.0.62"
+        "@kusto/language-service": "0.0.40",
+        "@kusto/language-service-next": "0.0.63"
     },
     "peerDependencies": {
         "monaco-editor": "0.34.1"

package/release/dev/kustoMode.js

@@ -2304,6 +2304,51 @@ var t=_l[n],r=/^(?:push|sort|unshift)$/.test(n)?"tap":"thru",e=/^(?:pop|shift)$/
 Z.prototype.chain=tf,Z.prototype.commit=rf,Z.prototype.next=ef,Z.prototype.plant=of,Z.prototype.reverse=ff,Z.prototype.toJSON=Z.prototype.valueOf=Z.prototype.value=cf,Z.prototype.first=Z.prototype.head,Ul&&(Z.prototype[Ul]=uf),Z},be=de();"function"==typeof define&&"object"==typeof define.amd&&define.amd?(re._=be,define('lodash/lodash.min',[],function(){return be})):ue?((ue.exports=be)._=be,ee._=be):re._=be}).call(this);
 define('lodash', ['lodash/lodash.min'], function (main) { return main; });
 
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 define('vs/language/kusto/languageFeatures',["require", "exports", "vscode-languageserver-types", "lodash"], function (require, exports, ls, _) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -2386,6 +2431,26 @@ define('vs/language/kusto/languageFeatures',["require", "exports", "vscode-langu
                     delete _this._debouncedValidations[uriStr];
                 }
             };
+            this._disposables.push(monaco.languages.registerCodeActionProvider(this._languageId, {
+                provideCodeActions: function (model, range, context, _token) { return __awaiter(_this, void 0, void 0, function () {
+                    var startOffset, endOffset, showQuickFix, actions;
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0:
+                                startOffset = model.getOffsetAt(range.getStartPosition());
+                                endOffset = model.getOffsetAt(range.getEndPosition());
+                                showQuickFix = context.markers.length > 0;
+                                return [4 /*yield*/, this.getMonacoCodeActions(model, startOffset, endOffset, showQuickFix)];
+                            case 1:
+                                actions = _a.sent();
+                                return [2 /*return*/, {
+                                        actions: actions,
+                                        dispose: function () { }
+                                    }];
+                        }
+                    });
+                }); }
+            }));
             this._disposables.push(this._monacoInstance.editor.onDidCreateEditor(onEditorAdd));
             this._disposables.push(this._monacoInstance.editor.onDidCreateModel(onModelAdd));
             this._disposables.push(this._monacoInstance.editor.onWillDisposeModel(onModelRemoved));
@@ -2409,6 +2474,64 @@ define('vs/language/kusto/languageFeatures',["require", "exports", "vscode-langu
             this._monacoInstance.editor.getModels().forEach(onModelAdd);
             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;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            actions = [];
+                            return [4 /*yield*/, this._worker(model.uri)];
+                        case 1:
+                            worker = _b.sent();
+                            resource = model.uri;
+                            return [4 /*yield*/, worker.getResultActions(resource.toString(), startOffset, endOffset)];
+                        case 2:
+                            codeActions = _b.sent();
+                            _loop_1 = function (i) {
+                                var codeAction = codeActions[i];
+                                if (codeAction.title.includes('Extract Function')) {
+                                    return "continue";
+                                }
+                                var codeActionKind = ((_a = this_1.defaults.languageSettings.quickFixCodeActions) === null || _a === void 0 ? void 0 : _a.find(function (actionTitle) { return codeAction.title.includes(actionTitle); })) ? 'quickfix' : 'custom';
+                                if (codeActionKind === 'quickfix' && !enableQuickFix) {
+                                    return { value: void 0 };
+                                }
+                                var changes = codeAction.changes;
+                                var edits = changes.map(function (change) {
+                                    var _a;
+                                    var startPosition = model.getPositionAt(change.start);
+                                    var endPosition = model.getPositionAt(change.start + change.deleteLength);
+                                    return {
+                                        resource: model.uri,
+                                        textEdit: {
+                                            range: { startLineNumber: startPosition.lineNumber, startColumn: startPosition.column, endLineNumber: endPosition.lineNumber, endColumn: endPosition.column },
+                                            text: (_a = change.insertText) !== null && _a !== void 0 ? _a : ''
+                                        }
+                                    };
+                                });
+                                actions.push({
+                                    title: codeAction.title,
+                                    diagnostics: [],
+                                    kind: codeActionKind,
+                                    edit: {
+                                        edits: __spreadArray([], edits, true)
+                                    },
+                                    isPreferred: true
+                                });
+                            };
+                            this_1 = this;
+                            for (i = 0; i < codeActions.length; i++) {
+                                state_1 = _loop_1(i);
+                                if (typeof state_1 === "object")
+                                    return [2 /*return*/, state_1.value];
+                            }
+                            return [2 /*return*/, actions];
+                    }
+                });
+            });
+        };
         DiagnosticsAdapter.prototype.getOrCreateDebouncedValidation = function (model, languageId) {
             var _this = this;
             var modelUri = model.uri.toString();

package/release/dev/kustoWorker.js

@@ -7270,6 +7270,49 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
             var lsDiagnostics = this.toLsDiagnostics(diagnostics, document);
             return Promise.resolve(lsDiagnostics);
         };
+        KustoLanguageService.prototype.getApplyCodeActions = function (document, start, end) {
+            var script = this.parseDocumentV2(document);
+            var block = this.getAffectedBlocks(this.toArray(script.Blocks), [{ start: start, end: end }])[0];
+            var codeActionInfo = block.Service.GetCodeActions(start, start, end - start + 1, null, true, null, new Kusto.Language.Utils.CancellationToken());
+            var codeActions = this.toArray(codeActionInfo.Actions);
+            // Some code actions are of type "MenuAction". We want to flat them out, to show them seperately.
+            var flatCodeActions = [];
+            for (var i = 0; i < codeActions.length; i++) {
+                flatCodeActions.push.apply(flatCodeActions, this.flattenCodeActions(codeActions[i]));
+            }
+            return flatCodeActions;
+        };
+        KustoLanguageService.prototype.getResultActions = function (document, start, end) {
+            var _this = this;
+            var script = this.parseDocumentV2(document);
+            var block = this.getAffectedBlocks(this.toArray(script.Blocks), [{ start: start, end: end }])[0];
+            var applyCodeActions = this.getApplyCodeActions(document, start, end);
+            var resultActionsMap = applyCodeActions.map(function (applyCodeAction) {
+                var changes = [];
+                var codeActionResults = _this.toArray(block.Service.ApplyCodeAction(applyCodeAction, start).Actions);
+                var changeTextAction = codeActionResults.find(function (c) { return c instanceof Kusto.Language.Editor.ChangeTextAction; });
+                if (changeTextAction) {
+                    changes = _this.toArray(changeTextAction.Changes)
+                        .map(function (change) { return ({ start: change.Start + block.Start, deleteLength: change.DeleteLength, insertText: change.InsertText }); });
+                }
+                return { title: applyCodeAction.Title, changes: changes };
+            })
+                .filter(function (resultAction) { return resultAction.changes.length; });
+            return Promise.resolve(resultActionsMap);
+        };
+        KustoLanguageService.prototype.flattenCodeActions = function (codeAction) {
+            var applyActions = [];
+            if (codeAction instanceof k2.ApplyAction) {
+                applyActions.push(codeAction);
+            }
+            else if (codeAction instanceof k2.MenuAction) {
+                var nestedCodeActions = this.toArray(codeAction.Actions);
+                for (var i = 0; i < nestedCodeActions.length; i++) {
+                    applyActions.push.apply(applyActions, this.flattenCodeActions(nestedCodeActions[i]));
+                }
+            }
+            return applyActions;
+        };
         KustoLanguageService.prototype.toLsDiagnostics = function (diagnostics, document) {
             return diagnostics
                 .filter(function (diag) { return diag.HasLocation; })
@@ -7437,8 +7480,9 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
         KustoLanguageService.prototype.setSchema = function (schema) {
             var _this = this;
             this._schema = schema;
-            if (this._languageSettings.useIntellisenseV2) {
-                var kustoJsSchemaV2 = schema && schema.clusterType === 'Engine' ? this.convertToKustoJsSchemaV2(schema) : null;
+            // We support intellisenseV2 only if the clusterType is "Engine", even if the setting is enabled
+            if (this._languageSettings.useIntellisenseV2 && schema && schema.clusterType === 'Engine') {
+                var kustoJsSchemaV2 = this.convertToKustoJsSchemaV2(schema);
                 this._kustoJsSchemaV2 = kustoJsSchemaV2;
                 this._script = undefined;
                 this._parsePropertiesV2 = undefined;
@@ -8622,6 +8666,10 @@ define('vs/language/kusto/kustoWorker',["require", "exports", "./languageService
             var diagnostics = this._languageService.doValidation(document, intervals, includeWarnings, includeSuggestions);
             return diagnostics;
         };
+        KustoWorker.prototype.getResultActions = function (uri, start, end) {
+            var document = this._getTextDocument(uri);
+            return this._languageService.getResultActions(document, start, end);
+        };
         KustoWorker.prototype.doRangeFormat = function (uri, range) {
             var document = this._getTextDocument(uri);
             var formatted = this._languageService.doRangeFormat(document, range);

package/release/dev/monaco.contribution.js

@@ -205,6 +205,7 @@ define('vs/language/kusto/monaco.contribution',["require", "exports", "./command
         enableQueryWarnings: false,
         enableQuerySuggestions: false,
         disabledDiagnosticCodes: [],
+        quickFixCodeActions: ['Change to'],
     };
     function getKustoWorker() {
         return new Promise(function (resolve, reject) {

package/release/esm/kustoWorker.js

@@ -142,6 +142,10 @@ var KustoWorker = /** @class */ (function () {
         var diagnostics = this._languageService.doValidation(document, intervals, includeWarnings, includeSuggestions);
         return diagnostics;
     };
+    KustoWorker.prototype.getResultActions = function (uri, start, end) {
+        var document = this._getTextDocument(uri);
+        return this._languageService.getResultActions(document, start, end);
+    };
     KustoWorker.prototype.doRangeFormat = function (uri, range) {
         var document = this._getTextDocument(uri);
         var formatted = this._languageService.doRangeFormat(document, range);

package/release/esm/languageFeatures.js

@@ -1,3 +1,48 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 import * as ls from './_deps/vscode-languageserver-types/main';
 import * as _ from './_deps/lodash/lodash';
 var Uri = monaco.Uri;
@@ -78,6 +123,26 @@ var DiagnosticsAdapter = /** @class */ (function () {
                 delete _this._debouncedValidations[uriStr];
             }
         };
+        this._disposables.push(monaco.languages.registerCodeActionProvider(this._languageId, {
+            provideCodeActions: function (model, range, context, _token) { return __awaiter(_this, void 0, void 0, function () {
+                var startOffset, endOffset, showQuickFix, actions;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            startOffset = model.getOffsetAt(range.getStartPosition());
+                            endOffset = model.getOffsetAt(range.getEndPosition());
+                            showQuickFix = context.markers.length > 0;
+                            return [4 /*yield*/, this.getMonacoCodeActions(model, startOffset, endOffset, showQuickFix)];
+                        case 1:
+                            actions = _a.sent();
+                            return [2 /*return*/, {
+                                    actions: actions,
+                                    dispose: function () { }
+                                }];
+                    }
+                });
+            }); }
+        }));
         this._disposables.push(this._monacoInstance.editor.onDidCreateEditor(onEditorAdd));
         this._disposables.push(this._monacoInstance.editor.onDidCreateModel(onModelAdd));
         this._disposables.push(this._monacoInstance.editor.onWillDisposeModel(onModelRemoved));
@@ -101,6 +166,64 @@ var DiagnosticsAdapter = /** @class */ (function () {
         this._monacoInstance.editor.getModels().forEach(onModelAdd);
         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;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        actions = [];
+                        return [4 /*yield*/, this._worker(model.uri)];
+                    case 1:
+                        worker = _b.sent();
+                        resource = model.uri;
+                        return [4 /*yield*/, worker.getResultActions(resource.toString(), startOffset, endOffset)];
+                    case 2:
+                        codeActions = _b.sent();
+                        _loop_1 = function (i) {
+                            var codeAction = codeActions[i];
+                            if (codeAction.title.includes('Extract Function')) {
+                                return "continue";
+                            }
+                            var codeActionKind = ((_a = this_1.defaults.languageSettings.quickFixCodeActions) === null || _a === void 0 ? void 0 : _a.find(function (actionTitle) { return codeAction.title.includes(actionTitle); })) ? 'quickfix' : 'custom';
+                            if (codeActionKind === 'quickfix' && !enableQuickFix) {
+                                return { value: void 0 };
+                            }
+                            var changes = codeAction.changes;
+                            var edits = changes.map(function (change) {
+                                var _a;
+                                var startPosition = model.getPositionAt(change.start);
+                                var endPosition = model.getPositionAt(change.start + change.deleteLength);
+                                return {
+                                    resource: model.uri,
+                                    textEdit: {
+                                        range: { startLineNumber: startPosition.lineNumber, startColumn: startPosition.column, endLineNumber: endPosition.lineNumber, endColumn: endPosition.column },
+                                        text: (_a = change.insertText) !== null && _a !== void 0 ? _a : ''
+                                    }
+                                };
+                            });
+                            actions.push({
+                                title: codeAction.title,
+                                diagnostics: [],
+                                kind: codeActionKind,
+                                edit: {
+                                    edits: __spreadArray([], edits, true)
+                                },
+                                isPreferred: true
+                            });
+                        };
+                        this_1 = this;
+                        for (i = 0; i < codeActions.length; i++) {
+                            state_1 = _loop_1(i);
+                            if (typeof state_1 === "object")
+                                return [2 /*return*/, state_1.value];
+                        }
+                        return [2 /*return*/, actions];
+                }
+            });
+        });
+    };
     DiagnosticsAdapter.prototype.getOrCreateDebouncedValidation = function (model, languageId) {
         var _this = this;
         var modelUri = model.uri.toString();

package/release/esm/languageService/kustoLanguageService.js

@@ -618,6 +618,49 @@ var KustoLanguageService = /** @class */ (function () {
         var lsDiagnostics = this.toLsDiagnostics(diagnostics, document);
         return Promise.resolve(lsDiagnostics);
     };
+    KustoLanguageService.prototype.getApplyCodeActions = function (document, start, end) {
+        var script = this.parseDocumentV2(document);
+        var block = this.getAffectedBlocks(this.toArray(script.Blocks), [{ start: start, end: end }])[0];
+        var codeActionInfo = block.Service.GetCodeActions(start, start, end - start + 1, null, true, null, new Kusto.Language.Utils.CancellationToken());
+        var codeActions = this.toArray(codeActionInfo.Actions);
+        // Some code actions are of type "MenuAction". We want to flat them out, to show them seperately.
+        var flatCodeActions = [];
+        for (var i = 0; i < codeActions.length; i++) {
+            flatCodeActions.push.apply(flatCodeActions, this.flattenCodeActions(codeActions[i]));
+        }
+        return flatCodeActions;
+    };
+    KustoLanguageService.prototype.getResultActions = function (document, start, end) {
+        var _this = this;
+        var script = this.parseDocumentV2(document);
+        var block = this.getAffectedBlocks(this.toArray(script.Blocks), [{ start: start, end: end }])[0];
+        var applyCodeActions = this.getApplyCodeActions(document, start, end);
+        var resultActionsMap = applyCodeActions.map(function (applyCodeAction) {
+            var changes = [];
+            var codeActionResults = _this.toArray(block.Service.ApplyCodeAction(applyCodeAction, start).Actions);
+            var changeTextAction = codeActionResults.find(function (c) { return c instanceof Kusto.Language.Editor.ChangeTextAction; });
+            if (changeTextAction) {
+                changes = _this.toArray(changeTextAction.Changes)
+                    .map(function (change) { return ({ start: change.Start + block.Start, deleteLength: change.DeleteLength, insertText: change.InsertText }); });
+            }
+            return { title: applyCodeAction.Title, changes: changes };
+        })
+            .filter(function (resultAction) { return resultAction.changes.length; });
+        return Promise.resolve(resultActionsMap);
+    };
+    KustoLanguageService.prototype.flattenCodeActions = function (codeAction) {
+        var applyActions = [];
+        if (codeAction instanceof k2.ApplyAction) {
+            applyActions.push(codeAction);
+        }
+        else if (codeAction instanceof k2.MenuAction) {
+            var nestedCodeActions = this.toArray(codeAction.Actions);
+            for (var i = 0; i < nestedCodeActions.length; i++) {
+                applyActions.push.apply(applyActions, this.flattenCodeActions(nestedCodeActions[i]));
+            }
+        }
+        return applyActions;
+    };
     KustoLanguageService.prototype.toLsDiagnostics = function (diagnostics, document) {
         return diagnostics
             .filter(function (diag) { return diag.HasLocation; })
@@ -785,8 +828,9 @@ var KustoLanguageService = /** @class */ (function () {
     KustoLanguageService.prototype.setSchema = function (schema) {
         var _this = this;
         this._schema = schema;
-        if (this._languageSettings.useIntellisenseV2) {
-            var kustoJsSchemaV2 = schema && schema.clusterType === 'Engine' ? this.convertToKustoJsSchemaV2(schema) : null;
+        // We support intellisenseV2 only if the clusterType is "Engine", even if the setting is enabled
+        if (this._languageSettings.useIntellisenseV2 && schema && schema.clusterType === 'Engine') {
+            var kustoJsSchemaV2 = this.convertToKustoJsSchemaV2(schema);
             this._kustoJsSchemaV2 = kustoJsSchemaV2;
             this._script = undefined;
             this._parsePropertiesV2 = undefined;

package/release/esm/monaco.contribution.js

@@ -62,6 +62,7 @@ var defaultLanguageSettings = {
     enableQueryWarnings: false,
     enableQuerySuggestions: false,
     disabledDiagnosticCodes: [],
+    quickFixCodeActions: ['Change to'],
 };
 function getKustoWorker() {
     return new Promise(function (resolve, reject) {

package/release/esm/monaco.d.ts

@@ -26,6 +26,7 @@ declare module monaco.languages.kusto {
         enableQueryWarnings?: boolean;
         enableQuerySuggestions?: boolean;
         disabledDiagnosticCodes?: string[];
+        quickFixCodeActions?: QuickFixCodeActionOptions[];
     }
 
     export interface SyntaxErrorAsMarkDownOptions {
@@ -34,6 +35,8 @@ declare module monaco.languages.kusto {
         enableSyntaxErrorAsMarkDown?: boolean;
     }
 
+    export type QuickFixCodeActionOptions = 'Extract Expression' | 'Extract Function' | 'Change to';
+
     export interface FormatterOptions {
         indentationSize?: number;
         pipeOperatorStyle?: FormatterPlacementStyle;