@kusto/monaco-kusto 12.0.10 → 12.0.11

package/README.md

@@ -85,6 +85,10 @@ Every PR should come with a test that checks it.
 
 ## Changelog
 
+### 12.0.11
+
+-   fix: avoid race condition on worker disposal
+
 ### 12.0.10
 
 -   fix: Parameter docstrings not shown

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kusto/monaco-kusto",
-    "version": "12.0.10",
+    "version": "12.0.11",
     "description": "CSL, KQL plugin for the Monaco Editor",
     "author": {
         "name": "Microsoft"

package/release/dev/kustoMode.js

@@ -1,11 +1,11 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 12.0.10(45043a1eff35e1151edde6f70c24b55565dda115)
+ * monaco-kusto version: 12.0.11(1f40b10df7cdf22320a5540a3bfc8e2ee7f92bee)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
 
-define('vs/language/kusto/kustoMode', ['exports', 'vs/editor/editor.main', './main-eff7d47e', './types-cf1c0652'], (function (exports, monaco, main, types$1) { 'use strict';
+define('vs/language/kusto/kustoMode', ['exports', 'vs/editor/editor.main', './main-37d643e2', './types-f09c24e4'], (function (exports, monaco, main, types$1) { 'use strict';
 
     function _interopNamespaceDefault(e) {
         var n = Object.create(null);
@@ -30,6 +30,9 @@ define('vs/language/kusto/kustoMode', ['exports', 'vs/editor/editor.main', './ma
     function _typeof$9(o) { "@babel/helpers - typeof"; return _typeof$9 = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof$9(o); }
     function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
     function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.indexOf(n) >= 0) continue; t[n] = r[n]; } return t; }
+    function _regeneratorRuntime$4() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime$4 = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof$9(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof$9(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+    function asyncGeneratorStep$4(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
+    function _asyncToGenerator$4(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep$4(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep$4(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
     function _classCallCheck$2(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
     function _defineProperties$2(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey$3(o.key), o); } }
     function _createClass$2(e, r, t) { return r && _defineProperties$2(e.prototype, r), t && _defineProperties$2(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
@@ -41,11 +44,9 @@ define('vs/language/kusto/kustoMode', ['exports', 'vs/editor/editor.main', './ma
         _classCallCheck$2(this, WorkerManager);
         this._monacoInstance = _monacoInstance;
         this._defaults = defaults;
-        this._worker = null;
         this._idleCheckInterval = self.setInterval(function () {
           return _this._checkIfIdle();
         }, 30 * 1000);
-        this._lastUsedTime = 0;
         this._configChangeListener = this._defaults.onDidChange(function () {
           return _this._saveStateAndStopWorker();
         });
@@ -53,20 +54,37 @@ define('vs/language/kusto/kustoMode', ['exports', 'vs/editor/editor.main', './ma
       return _createClass$2(WorkerManager, [{
         key: "_stopWorker",
         value: function _stopWorker() {
-          if (this._worker) {
-            this._worker.dispose();
-            this._worker = null;
-          }
-          this._client = null;
+          var workerToStop = this._workerDetails;
+          this._workerDetailsPromise = null;
+          this._workerDetails = null;
+
+          // Ensure disposal occurs only after the last request completes.
+          // This is necessary because setting the languageSettings disposes of the worker,
+          // causing the setSchema call to remain unresolved, which prevents the semantic tokens provider from being registered.
+          setTimeout( /*#__PURE__*/_asyncToGenerator$4( /*#__PURE__*/_regeneratorRuntime$4().mark(function _callee() {
+            return _regeneratorRuntime$4().wrap(function _callee$(_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  if (workerToStop._worker) {
+                    workerToStop._worker.dispose();
+                  }
+                case 1:
+                case "end":
+                  return _context.stop();
+              }
+            }, _callee);
+          })), 5000);
         }
       }, {
         key: "_saveStateAndStopWorker",
         value: function _saveStateAndStopWorker() {
-          var _this2 = this;
-          if (!this._worker) {
+          var _this$_workerDetails,
+            _this$_workerDetails2,
+            _this2 = this;
+          if (!((_this$_workerDetails = this._workerDetails) !== null && _this$_workerDetails !== void 0 && _this$_workerDetails._worker)) {
             return;
           }
-          this._worker.getProxy().then(function (proxy) {
+          (_this$_workerDetails2 = this._workerDetails) === null || _this$_workerDetails2 === void 0 || _this$_workerDetails2._worker.getProxy().then(function (proxy) {
             proxy.getSchema().then(function (schema) {
               _this2._storedState = {
                 schema: schema
@@ -85,11 +103,12 @@ define('vs/language/kusto/kustoMode', ['exports', 'vs/editor/editor.main', './ma
       }, {
         key: "_checkIfIdle",
         value: function _checkIfIdle() {
-          if (!this._worker) {
+          var _this$_workerDetails3, _this$_workerDetails4;
+          if (!((_this$_workerDetails3 = this._workerDetails) !== null && _this$_workerDetails3 !== void 0 && _this$_workerDetails3._worker)) {
             return;
           }
           var maxIdleTime = this._defaults.getWorkerMaxIdleTime();
-          var timePassedSinceLastUsed = Date.now() - this._lastUsedTime;
+          var timePassedSinceLastUsed = Date.now() - ((_this$_workerDetails4 = this._workerDetails) === null || _this$_workerDetails4 === void 0 ? void 0 : _this$_workerDetails4._lastUsedTime);
           if (maxIdleTime > 0 && timePassedSinceLastUsed > maxIdleTime) {
             this._saveStateAndStopWorker();
           }
@@ -98,14 +117,12 @@ define('vs/language/kusto/kustoMode', ['exports', 'vs/editor/editor.main', './ma
         key: "_getClient",
         value: function _getClient() {
           var _this3 = this;
-          this._lastUsedTime = Date.now();
-
           // Since onDidProvideCompletionItems is not used in web worker, and since functions cannot be trivially serialized (throws exception unable to clone), We remove it here.
           var _this$_defaults$langu = this._defaults.languageSettings;
             _this$_defaults$langu.onDidProvideCompletionItems;
             var languageSettings = _objectWithoutProperties(_this$_defaults$langu, _excluded);
-          if (!this._client) {
-            this._worker = this._monacoInstance.editor.createWebWorker({
+          if (!this._workerDetailsPromise) {
+            var worker = this._monacoInstance.editor.createWebWorker({
               // module that exports the create() method and returns a `KustoWorker` instance
               moduleId: 'vs/language/kusto/kustoWorker',
               label: 'kusto',
@@ -115,7 +132,7 @@ define('vs/language/kusto/kustoMode', ['exports', 'vs/editor/editor.main', './ma
                 languageId: 'kusto'
               }
             });
-            this._client = this._worker.getProxy().then(function (proxy) {
+            var client = worker.getProxy().then(function (proxy) {
               // push state we held onto before killing the client.
               if (_this3._storedState) {
                 return proxy.setSchema(_this3._storedState.schema).then(function () {
@@ -125,8 +142,16 @@ define('vs/language/kusto/kustoMode', ['exports', 'vs/editor/editor.main', './ma
                 return proxy;
               }
             });
+            this._workerDetailsPromise = client.then(function (client) {
+              _this3._workerDetails = {
+                _worker: worker,
+                _client: client,
+                _lastUsedTime: Date.now()
+              };
+              return _this3._workerDetails;
+            });
           }
-          return this._client;
+          return this._workerDetailsPromise;
         }
       }, {
         key: "getLanguageServiceWorker",
@@ -137,9 +162,10 @@ define('vs/language/kusto/kustoMode', ['exports', 'vs/editor/editor.main', './ma
           }
           var _client;
           return this._getClient().then(function (client) {
-            _client = client;
+            _client = client._client;
           }).then(function (_) {
-            return _this4._worker.withSyncedResources(resources);
+            var _this4$_workerDetails;
+            return (_this4$_workerDetails = _this4._workerDetails) === null || _this4$_workerDetails === void 0 || (_this4$_workerDetails = _this4$_workerDetails._worker) === null || _this4$_workerDetails === void 0 ? void 0 : _this4$_workerDetails.withSyncedResources(resources);
           }).then(function (_) {
             return _client;
           });
@@ -1660,11 +1686,8 @@ define('vs/language/kusto/kustoMode', ['exports', 'vs/editor/editor.main', './ma
      */
     function setupMode(defaults, monacoInstance) {
       var onSchemaChange = new monaco__namespace.Emitter();
-      // TODO: when should we dispose of these? seems like monaco-css and monaco-typescript don't dispose of these.
-      var disposables = [];
       var semanticTokensProviderRegistrar = semanticTokensProviderRegistrarCreator();
       var client = new WorkerManager(monacoInstance, defaults);
-      disposables.push(client);
       var workerAccessor = function workerAccessor(first) {
         var augmentedSetSchema = /*#__PURE__*/function () {
           var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(schema, worker) {
@@ -1723,34 +1746,21 @@ define('vs/language/kusto/kustoMode', ['exports', 'vs/editor/editor.main', './ma
           });
         });
       };
-      disposables.push(monacoInstance.languages.registerCompletionItemProvider(types$1.LANGUAGE_ID, new CompletionAdapter(workerAccessor, defaults.languageSettings)));
-      disposables.push(monacoInstance.languages.setMonarchTokensProvider(types$1.LANGUAGE_ID, kustoLanguageDefinition));
-      disposables.push(new DiagnosticsAdapter(monacoInstance, types$1.LANGUAGE_ID, workerAccessor, defaults, onSchemaChange.event));
-      disposables.push(monacoInstance.languages.registerDocumentRangeFormattingEditProvider(types$1.LANGUAGE_ID, new FormatAdapter(workerAccessor)));
-      disposables.push(monacoInstance.languages.registerFoldingRangeProvider(types$1.LANGUAGE_ID, new FoldingAdapter(workerAccessor)));
-      disposables.push(monacoInstance.languages.registerDefinitionProvider(types$1.LANGUAGE_ID, new DefinitionAdapter(workerAccessor)));
-      disposables.push(monacoInstance.languages.registerRenameProvider(types$1.LANGUAGE_ID, new RenameAdapter(workerAccessor)));
-      disposables.push(monacoInstance.languages.registerReferenceProvider(types$1.LANGUAGE_ID, new ReferenceAdapter(workerAccessor)));
+      monacoInstance.languages.registerCompletionItemProvider(types$1.LANGUAGE_ID, new CompletionAdapter(workerAccessor, defaults.languageSettings));
+      monacoInstance.languages.setMonarchTokensProvider(types$1.LANGUAGE_ID, kustoLanguageDefinition);
+      new DiagnosticsAdapter(monacoInstance, types$1.LANGUAGE_ID, workerAccessor, defaults, onSchemaChange.event);
+      monacoInstance.languages.registerDocumentRangeFormattingEditProvider(types$1.LANGUAGE_ID, new FormatAdapter(workerAccessor));
+      monacoInstance.languages.registerFoldingRangeProvider(types$1.LANGUAGE_ID, new FoldingAdapter(workerAccessor));
+      monacoInstance.languages.registerDefinitionProvider(types$1.LANGUAGE_ID, new DefinitionAdapter(workerAccessor));
+      monacoInstance.languages.registerRenameProvider(types$1.LANGUAGE_ID, new RenameAdapter(workerAccessor));
+      monacoInstance.languages.registerReferenceProvider(types$1.LANGUAGE_ID, new ReferenceAdapter(workerAccessor));
       if (defaults.languageSettings.enableHover) {
-        disposables.push(monacoInstance.languages.registerHoverProvider(types$1.LANGUAGE_ID, new HoverAdapter(workerAccessor)));
+        monacoInstance.languages.registerHoverProvider(types$1.LANGUAGE_ID, new HoverAdapter(workerAccessor));
       }
       monacoInstance.languages.registerDocumentFormattingEditProvider(types$1.LANGUAGE_ID, new DocumentFormatAdapter(workerAccessor));
       kustoWorker = workerAccessor;
       resolveWorker(workerAccessor);
-      disposables.push(monacoInstance.languages.setLanguageConfiguration(types$1.LANGUAGE_ID, kanguageConfiguration));
-      return asDisposable(disposables);
-    }
-    function asDisposable(disposables) {
-      return {
-        dispose: function dispose() {
-          return disposeAll(disposables);
-        }
-      };
-    }
-    function disposeAll(disposables) {
-      disposables.forEach(function (d) {
-        return d.dispose();
-      });
+      monacoInstance.languages.setLanguageConfiguration(types$1.LANGUAGE_ID, kanguageConfiguration);
     }
     function getKustoWorker() {
       return workerPromise.then(function () {

package/release/dev/kustoWorker.js

@@ -1,11 +1,11 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 12.0.10(45043a1eff35e1151edde6f70c24b55565dda115)
+ * monaco-kusto version: 12.0.11(1f40b10df7cdf22320a5540a3bfc8e2ee7f92bee)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
 
-define('vs/language/kusto/kustoWorker', ['exports', './main-eff7d47e', './schema-bbdce01a'], (function (exports, main, schema) { 'use strict';
+define('vs/language/kusto/kustoWorker', ['exports', './main-37d643e2', './schema-301c9f75'], (function (exports, main, schema) { 'use strict';
 
     function _slicedToArray$2(r, e) { return _arrayWithHoles$2(r) || _iterableToArrayLimit$2(r, e) || _unsupportedIterableToArray$3(r, e) || _nonIterableRest$2(); }
     function _nonIterableRest$2() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }

package/release/dev/{main-eff7d47e.js → main-37d643e2.js}

@@ -1,11 +1,11 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 12.0.10(45043a1eff35e1151edde6f70c24b55565dda115)
+ * monaco-kusto version: 12.0.11(1f40b10df7cdf22320a5540a3bfc8e2ee7f92bee)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
 
-define('vs/language/kusto/main-eff7d47e', ['exports'], (function (exports) { 'use strict';
+define('vs/language/kusto/main-37d643e2', ['exports'], (function (exports) { 'use strict';
 
     /* --------------------------------------------------------------------------------------------
      * Copyright (c) Microsoft Corporation. All rights reserved.

package/release/dev/monaco.contribution.js

@@ -1,11 +1,11 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 12.0.10(45043a1eff35e1151edde6f70c24b55565dda115)
+ * monaco-kusto version: 12.0.11(1f40b10df7cdf22320a5540a3bfc8e2ee7f92bee)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
 
-define('vs/language/kusto/monaco.contribution', ['require', 'exports', 'vs/editor/editor.main', './types-cf1c0652', './schema-bbdce01a'], (function (require, exports, monaco, types, schema) { 'use strict';
+define('vs/language/kusto/monaco.contribution', ['require', 'exports', 'vs/editor/editor.main', './types-f09c24e4', './schema-301c9f75'], (function (require, exports, monaco, types, schema) { 'use strict';
 
     function _interopNamespaceDefault(e) {
         var n = Object.create(null);
@@ -492,7 +492,6 @@ define('vs/language/kusto/monaco.contribution', ['require', 'exports', 'vs/edito
       return new Promise(function (resolve, reject) { require(['./kustoMode'], resolve, reject); }).then(callback);
     }
     var kustoDefaults = new LanguageServiceDefaultsImpl(defaultLanguageSettings);
-    var disposable;
     monaco__namespace.languages.onLanguage('kusto', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -502,16 +501,11 @@ define('vs/language/kusto/monaco.contribution', ['require', 'exports', 'vs/edito
               return mode.setupMode(kustoDefaults, monaco__namespace);
             });
           case 2:
-            disposable = _context.sent;
-          case 3:
           case "end":
             return _context.stop();
         }
       }, _callee);
     })));
-    monaco__namespace.editor.onWillDisposeModel(function (model) {
-      disposable.dispose();
-    });
     monaco__namespace.languages.register({
       id: types.LANGUAGE_ID,
       extensions: ['.csl', '.kql']

package/release/dev/{schema-bbdce01a.js → schema-301c9f75.js}

@@ -1,11 +1,11 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 12.0.10(45043a1eff35e1151edde6f70c24b55565dda115)
+ * monaco-kusto version: 12.0.11(1f40b10df7cdf22320a5540a3bfc8e2ee7f92bee)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
 
-define('vs/language/kusto/schema-bbdce01a', ['exports'], (function (exports) { 'use strict';
+define('vs/language/kusto/schema-301c9f75', ['exports'], (function (exports) { 'use strict';
 
     // Definition of schema object in the context of language services. This model is exposed to consumers of this library.
 

package/release/dev/{types-cf1c0652.js → types-f09c24e4.js}

@@ -1,11 +1,11 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 12.0.10(45043a1eff35e1151edde6f70c24b55565dda115)
+ * monaco-kusto version: 12.0.11(1f40b10df7cdf22320a5540a3bfc8e2ee7f92bee)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
 
-define('vs/language/kusto/types-cf1c0652', ['exports'], (function (exports) { 'use strict';
+define('vs/language/kusto/types-f09c24e4', ['exports'], (function (exports) { 'use strict';
 
     var LANGUAGE_ID = 'kusto';
 

package/release/esm/{globals-60173baa.js → globals-b3e95adf.js}

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 12.0.10(45043a1eff35e1151edde6f70c24b55565dda115)
+ * monaco-kusto version: 12.0.11(1f40b10df7cdf22320a5540a3bfc8e2ee7f92bee)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/

package/release/esm/kusto.worker.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 12.0.10(45043a1eff35e1151edde6f70c24b55565dda115)
+ * monaco-kusto version: 12.0.11(1f40b10df7cdf22320a5540a3bfc8e2ee7f92bee)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
@@ -8,7 +8,7 @@
 import * as worker from 'monaco-editor/esm/vs/editor/editor.worker';
 import * as ls from 'vscode-languageserver-types';
 import XRegExp from 'xregexp';
-import { d as getEntityDataTypeFromCslType, a as getCallName, b as getExpression, g as getCslTypeNameFromClrType } from './schema-e459243d.js';
+import { d as getEntityDataTypeFromCslType, a as getCallName, b as getExpression, g as getCslTypeNameFromClrType } from './schema-688702c2.js';
 import '@kusto/language-service/bridge.min';
 import '@kusto/language-service/Kusto.JavaScript.Client.min';
 import '@kusto/language-service/newtonsoft.json.min';

package/release/esm/kustoMode.d.ts

@@ -1,7 +1,6 @@
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
 import type { KustoWorker, LanguageServiceDefaults } from './monaco.contribution';
 import type { IKustoWorkerImpl } from './kustoWorker';
-import type { IDisposable } from 'monaco-editor';
 export interface AugmentedWorker extends KustoWorker, Omit<IKustoWorkerImpl, 'setSchemaFromShowSchema' | 'getReferencedSymbols'> {
 }
 export interface AugmentedWorkerAccessor {
@@ -11,5 +10,5 @@ export interface AugmentedWorkerAccessor {
  * Called when Kusto language is first needed (a model has the language set)
  * @param defaults
  */
-export declare function setupMode(defaults: LanguageServiceDefaults, monacoInstance: typeof globalThis.monaco): IDisposable;
+export declare function setupMode(defaults: LanguageServiceDefaults, monacoInstance: typeof globalThis.monaco): void;
 export declare function getKustoWorker(): Promise<AugmentedWorkerAccessor>;

package/release/esm/kustoMode.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 12.0.10(45043a1eff35e1151edde6f70c24b55565dda115)
+ * monaco-kusto version: 12.0.11(1f40b10df7cdf22320a5540a3bfc8e2ee7f92bee)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
@@ -8,29 +8,34 @@
 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 { L as LANGUAGE_ID, T as Token, t as tokenTypes } from './globals-60173baa.js';
+import { L as LANGUAGE_ID, T as Token, t as tokenTypes } from './globals-b3e95adf.js';
 
 class WorkerManager {
   constructor(_monacoInstance, defaults) {
     this._monacoInstance = _monacoInstance;
     this._defaults = defaults;
-    this._worker = null;
     this._idleCheckInterval = self.setInterval(() => this._checkIfIdle(), 30 * 1000);
-    this._lastUsedTime = 0;
     this._configChangeListener = this._defaults.onDidChange(() => this._saveStateAndStopWorker());
   }
   _stopWorker() {
-    if (this._worker) {
-      this._worker.dispose();
-      this._worker = null;
-    }
-    this._client = null;
+    const workerToStop = this._workerDetails;
+    this._workerDetailsPromise = null;
+    this._workerDetails = null;
+
+    // Ensure disposal occurs only after the last request completes.
+    // This is necessary because setting the languageSettings disposes of the worker,
+    // causing the setSchema call to remain unresolved, which prevents the semantic tokens provider from being registered.
+    setTimeout(async () => {
+      if (workerToStop._worker) {
+        workerToStop._worker.dispose();
+      }
+    }, 5000);
   }
   _saveStateAndStopWorker() {
-    if (!this._worker) {
+    if (!this._workerDetails?._worker) {
       return;
     }
-    this._worker.getProxy().then(proxy => {
+    this._workerDetails?._worker.getProxy().then(proxy => {
       proxy.getSchema().then(schema => {
         this._storedState = {
           schema: schema
@@ -45,25 +50,23 @@ class WorkerManager {
     this._stopWorker();
   }
   _checkIfIdle() {
-    if (!this._worker) {
+    if (!this._workerDetails?._worker) {
       return;
     }
     const maxIdleTime = this._defaults.getWorkerMaxIdleTime();
-    let timePassedSinceLastUsed = Date.now() - this._lastUsedTime;
+    let timePassedSinceLastUsed = Date.now() - this._workerDetails?._lastUsedTime;
     if (maxIdleTime > 0 && timePassedSinceLastUsed > maxIdleTime) {
       this._saveStateAndStopWorker();
     }
   }
   _getClient() {
-    this._lastUsedTime = Date.now();
-
     // Since onDidProvideCompletionItems is not used in web worker, and since functions cannot be trivially serialized (throws exception unable to clone), We remove it here.
     const {
       onDidProvideCompletionItems,
       ...languageSettings
     } = this._defaults.languageSettings;
-    if (!this._client) {
-      this._worker = this._monacoInstance.editor.createWebWorker({
+    if (!this._workerDetailsPromise) {
+      const worker = this._monacoInstance.editor.createWebWorker({
         // module that exports the create() method and returns a `KustoWorker` instance
         moduleId: 'vs/language/kusto/kustoWorker',
         label: 'kusto',
@@ -73,7 +76,7 @@ class WorkerManager {
           languageId: 'kusto'
         }
       });
-      this._client = this._worker.getProxy().then(proxy => {
+      const client = worker.getProxy().then(proxy => {
         // push state we held onto before killing the client.
         if (this._storedState) {
           return proxy.setSchema(this._storedState.schema).then(() => proxy);
@@ -81,15 +84,23 @@ class WorkerManager {
           return proxy;
         }
       });
+      this._workerDetailsPromise = client.then(client => {
+        this._workerDetails = {
+          _worker: worker,
+          _client: client,
+          _lastUsedTime: Date.now()
+        };
+        return this._workerDetails;
+      });
     }
-    return this._client;
+    return this._workerDetailsPromise;
   }
   getLanguageServiceWorker(...resources) {
     let _client;
     return this._getClient().then(client => {
-      _client = client;
+      _client = client._client;
     }).then(_ => {
-      return this._worker.withSyncedResources(resources);
+      return this._workerDetails?._worker?.withSyncedResources(resources);
     }).then(_ => _client);
   }
 }
@@ -856,11 +867,8 @@ let workerPromise = new Promise((resolve, reject) => {
  */
 function setupMode(defaults, monacoInstance) {
   const onSchemaChange = new monaco.Emitter();
-  // TODO: when should we dispose of these? seems like monaco-css and monaco-typescript don't dispose of these.
-  const disposables = [];
   const semanticTokensProviderRegistrar = semanticTokensProviderRegistrarCreator();
   const client = new WorkerManager(monacoInstance, defaults);
-  disposables.push(client);
   const workerAccessor = (first, ...more) => {
     const augmentedSetSchema = async (schema, worker) => {
       const workerPromise = worker.setSchema(schema);
@@ -887,32 +895,21 @@ function setupMode(defaults, monacoInstance) {
       }
     }));
   };
-  disposables.push(monacoInstance.languages.registerCompletionItemProvider(LANGUAGE_ID, new CompletionAdapter(workerAccessor, defaults.languageSettings)));
-  disposables.push(monacoInstance.languages.setMonarchTokensProvider(LANGUAGE_ID, kustoLanguageDefinition));
-  disposables.push(new DiagnosticsAdapter(monacoInstance, LANGUAGE_ID, workerAccessor, defaults, onSchemaChange.event));
-  disposables.push(monacoInstance.languages.registerDocumentRangeFormattingEditProvider(LANGUAGE_ID, new FormatAdapter(workerAccessor)));
-  disposables.push(monacoInstance.languages.registerFoldingRangeProvider(LANGUAGE_ID, new FoldingAdapter(workerAccessor)));
-  disposables.push(monacoInstance.languages.registerDefinitionProvider(LANGUAGE_ID, new DefinitionAdapter(workerAccessor)));
-  disposables.push(monacoInstance.languages.registerRenameProvider(LANGUAGE_ID, new RenameAdapter(workerAccessor)));
-  disposables.push(monacoInstance.languages.registerReferenceProvider(LANGUAGE_ID, new ReferenceAdapter(workerAccessor)));
+  monacoInstance.languages.registerCompletionItemProvider(LANGUAGE_ID, new CompletionAdapter(workerAccessor, defaults.languageSettings));
+  monacoInstance.languages.setMonarchTokensProvider(LANGUAGE_ID, kustoLanguageDefinition);
+  new DiagnosticsAdapter(monacoInstance, LANGUAGE_ID, workerAccessor, defaults, onSchemaChange.event);
+  monacoInstance.languages.registerDocumentRangeFormattingEditProvider(LANGUAGE_ID, new FormatAdapter(workerAccessor));
+  monacoInstance.languages.registerFoldingRangeProvider(LANGUAGE_ID, new FoldingAdapter(workerAccessor));
+  monacoInstance.languages.registerDefinitionProvider(LANGUAGE_ID, new DefinitionAdapter(workerAccessor));
+  monacoInstance.languages.registerRenameProvider(LANGUAGE_ID, new RenameAdapter(workerAccessor));
+  monacoInstance.languages.registerReferenceProvider(LANGUAGE_ID, new ReferenceAdapter(workerAccessor));
   if (defaults.languageSettings.enableHover) {
-    disposables.push(monacoInstance.languages.registerHoverProvider(LANGUAGE_ID, new HoverAdapter(workerAccessor)));
+    monacoInstance.languages.registerHoverProvider(LANGUAGE_ID, new HoverAdapter(workerAccessor));
   }
   monacoInstance.languages.registerDocumentFormattingEditProvider(LANGUAGE_ID, new DocumentFormatAdapter(workerAccessor));
   kustoWorker = workerAccessor;
   resolveWorker(workerAccessor);
-  disposables.push(monacoInstance.languages.setLanguageConfiguration(LANGUAGE_ID, kanguageConfiguration));
-  return asDisposable(disposables);
-}
-function asDisposable(disposables) {
-  return {
-    dispose: () => {
-      return disposeAll(disposables);
-    }
-  };
-}
-function disposeAll(disposables) {
-  disposables.forEach(d => d.dispose());
+  monacoInstance.languages.setLanguageConfiguration(LANGUAGE_ID, kanguageConfiguration);
 }
 function getKustoWorker() {
   return workerPromise.then(() => kustoWorker);

package/release/esm/monaco.contribution.js

@@ -1,15 +1,15 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 12.0.10(45043a1eff35e1151edde6f70c24b55565dda115)
+ * monaco-kusto version: 12.0.11(1f40b10df7cdf22320a5540a3bfc8e2ee7f92bee)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
 
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
 import { editor } from 'monaco-editor/esm/vs/editor/editor.api';
-import { T as Token, L as LANGUAGE_ID } from './globals-60173baa.js';
-import { g as getCslTypeNameFromClrType, a as getCallName, b as getExpression, c as getInputParametersAsCslString, d as getEntityDataTypeFromCslType } from './schema-e459243d.js';
-export { s as showSchema } from './schema-e459243d.js';
+import { T as Token, L as LANGUAGE_ID } from './globals-b3e95adf.js';
+import { g as getCslTypeNameFromClrType, a as getCallName, b as getExpression, c as getInputParametersAsCslString, d as getEntityDataTypeFromCslType } from './schema-688702c2.js';
+export { s as showSchema } from './schema-688702c2.js';
 
 function getCurrentCommandRange(editor, cursorPosition) {
   const zeroBasedCursorLineNumber = cursorPosition.lineNumber - 1;
@@ -429,12 +429,8 @@ function withMode(callback) {
   return import('./kustoMode.js').then(callback);
 }
 const kustoDefaults = new LanguageServiceDefaultsImpl(defaultLanguageSettings);
-let disposable;
 monaco.languages.onLanguage('kusto', async () => {
-  disposable = await withMode(mode => mode.setupMode(kustoDefaults, monaco));
-});
-monaco.editor.onWillDisposeModel(model => {
-  disposable.dispose();
+  await withMode(mode => mode.setupMode(kustoDefaults, monaco));
 });
 monaco.languages.register({
   id: LANGUAGE_ID,

package/release/esm/{schema-e459243d.js → schema-688702c2.js}

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 12.0.10(45043a1eff35e1151edde6f70c24b55565dda115)
+ * monaco-kusto version: 12.0.11(1f40b10df7cdf22320a5540a3bfc8e2ee7f92bee)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/

package/release/esm/workerManager.d.ts

@@ -6,10 +6,9 @@ export declare class WorkerManager {
     private _storedState;
     private _defaults;
     private _idleCheckInterval;
-    private _lastUsedTime;
     private _configChangeListener;
-    private _worker;
-    private _client;
+    private _workerDetails;
+    private _workerDetailsPromise;
     constructor(_monacoInstance: typeof monaco, defaults: LanguageServiceDefaults);
     private _stopWorker;
     private _saveStateAndStopWorker;