@difizen/libro-cofine-editor 0.1.13 → 0.1.15

package/es/editor-contribution.d.ts

@@ -1,10 +1,13 @@
-import type { CodeEditorFactory } from '@difizen/libro-code-editor';
+import type { CodeEditorFactory, EditorStateFactory } from '@difizen/libro-code-editor';
 import { CodeEditorContribution } from '@difizen/libro-code-editor';
+import { LanguageSpecRegistry } from './language-specs.js';
 import { LibroE2EditorFactory } from './libro-e2-editor.js';
 export declare class LibroE2EditorContribution implements CodeEditorContribution {
+    protected readonly languageSpecRegistry: LanguageSpecRegistry;
     factory: CodeEditorFactory;
     defaultConfig: Required<import("./libro-e2-editor.js").LibroE2EditorConfig>;
     constructor(libroE2EditorFactory: LibroE2EditorFactory);
+    stateFactory: EditorStateFactory<any>;
     canHandle(mime: string): number;
 }
 //# sourceMappingURL=editor-contribution.d.ts.map

package/es/editor-contribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editor-contribution.d.ts","sourceRoot":"","sources":["../src/editor-contribution.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAGpE,OAAO,EAAwB,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAElF,qBACa,yBAA0B,YAAW,sBAAsB;IACtE,OAAO,EAAE,iBAAiB,CAAC;IAE3B,aAAa,+DAAwB;gBAGL,oBAAoB,EAAE,oBAAoB;IAK1E,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;CAWhC"}
+{"version":3,"file":"editor-contribution.d.ts","sourceRoot":"","sources":["../src/editor-contribution.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACxF,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAGpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAGL,oBAAoB,EACrB,MAAM,sBAAsB,CAAC;AAE9B,qBACa,yBAA0B,YAAW,sBAAsB;IAEtE,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAE9D,OAAO,EAAE,iBAAiB,CAAC;IAE3B,aAAa,+DAAwB;gBAGL,oBAAoB,EAAE,oBAAoB;IAK1E,YAAY,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAKnC;IAEF,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;CAWhC"}

package/es/editor-contribution.js

@@ -1,19 +1,31 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "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(o); }
-var _dec, _class;
+var _dec, _dec2, _class, _class2, _descriptor;
+function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
+function _initializerWarningHelper(descriptor, context) { throw new Error('Decorating class property failed. Please ensure that ' + 'transform-class-properties is enabled and runs after the decorators transform.'); }
 import { CodeEditorContribution } from '@difizen/libro-code-editor';
 import { inject, singleton } from '@difizen/mana-app';
-import { libroE2DefaultConfig, LibroE2EditorFactory } from "./libro-e2-editor.js";
+import { LanguageSpecRegistry } from "./language-specs.js";
+import { e2StateFactory, libroE2DefaultConfig, LibroE2EditorFactory } from "./libro-e2-editor.js";
 export var LibroE2EditorContribution = (_dec = singleton({
   contrib: [CodeEditorContribution]
-}), _dec(_class = /*#__PURE__*/function () {
+}), _dec2 = inject(LanguageSpecRegistry), _dec(_class = (_class2 = /*#__PURE__*/function () {
   function LibroE2EditorContribution(libroE2EditorFactory) {
+    var _this = this;
     _classCallCheck(this, LibroE2EditorContribution);
+    _initializerDefineProperty(this, "languageSpecRegistry", _descriptor, this);
     this.defaultConfig = libroE2DefaultConfig;
+    this.stateFactory = function (options) {
+      return e2StateFactory(_this.languageSpecRegistry)({
+        uuid: options.uuid,
+        model: options.model
+      });
+    };
     this.factory = libroE2EditorFactory;
   }
   LibroE2EditorContribution = inject(LibroE2EditorFactory)(LibroE2EditorContribution, undefined, 0) || LibroE2EditorContribution;
@@ -28,4 +40,9 @@ export var LibroE2EditorContribution = (_dec = singleton({
     }
   }]);
   return LibroE2EditorContribution;
-}()) || _class);
+}(), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "languageSpecRegistry", [_dec2], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+})), _class2)) || _class);

package/es/language/lsp/completion-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"completion-provider.d.ts","sourceRoot":"","sources":["../../../src/language/lsp/completion-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AACtD,OAAO,KAAK,GAAG,MAAM,gCAAgC,CAAC;AAGtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAGzE,qBAAa,kBACX,SAAQ,uBACR,YAAW,MAAM,CAAC,SAAS,CAAC,sBAAsB;IAElD,iBAAiB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAEjC,sBAAsB,UACpB,OAAO,MAAM,CAAC,UAAU,YACrB,OAAO,QAAQ,KACxB,QAAQ,gBAAgB,CAAC,cAAc,GAAG,SAAS,CAAC,CAGrD;IAEF,SAAS,CAAC,gCAAgC,UACjC,OAAO,MAAM,CAAC,UAAU,YACrB,OAAO,QAAQ,KACxB,QAAQ,gBAAgB,CAAC,cAAc,GAAG,SAAS,CAAC,CAuCrD;IAEF,SAAS,CAAC,mCAAmC,UACpC,OAAO,MAAM,CAAC,UAAU,YACrB,OAAO,QAAQ,KACxB,QAAQ,gBAAgB,CAAC,cAAc,GAAG,SAAS,CAAC,CA8DrD;IAEF,qBAAqB,SACb,gBAAgB,CAAC,cAAc,SAC9B,OAAO,iBAAiB,KAC9B,QAAQ,gBAAgB,CAAC,cAAc,GAAG,SAAS,CAAC,CAcrD;IAEF,mBAAmB,CACjB,IAAI,EAAE,GAAG,CAAC,cAAc,EACxB,KAAK,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,oBAAoB,GAC3D,MAAM,CAAC,SAAS,CAAC,cAAc;CAgDnC"}
+{"version":3,"file":"completion-provider.d.ts","sourceRoot":"","sources":["../../../src/language/lsp/completion-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AACtD,OAAO,KAAK,GAAG,MAAM,gCAAgC,CAAC;AAGtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAGzE,qBAAa,kBACX,SAAQ,uBACR,YAAW,MAAM,CAAC,SAAS,CAAC,sBAAsB;IAElD,iBAAiB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAEjC,sBAAsB,UACpB,OAAO,MAAM,CAAC,UAAU,YACrB,OAAO,QAAQ,KACxB,QAAQ,gBAAgB,CAAC,cAAc,GAAG,SAAS,CAAC,CAGrD;IAEF,SAAS,CAAC,gCAAgC,UACjC,OAAO,MAAM,CAAC,UAAU,YACrB,OAAO,QAAQ,KACxB,QAAQ,gBAAgB,CAAC,cAAc,GAAG,SAAS,CAAC,CAuCrD;IAEF,SAAS,CAAC,mCAAmC,UACpC,OAAO,MAAM,CAAC,UAAU,YACrB,OAAO,QAAQ,KACxB,QAAQ,gBAAgB,CAAC,cAAc,GAAG,SAAS,CAAC,CA8DrD;IAEF,qBAAqB,SACb,gBAAgB,CAAC,cAAc,SAC9B,OAAO,iBAAiB,KAC9B,QAAQ,gBAAgB,CAAC,cAAc,GAAG,SAAS,CAAC,CAarD;IAEF,mBAAmB,CACjB,IAAI,EAAE,GAAG,CAAC,cAAc,EACxB,KAAK,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,oBAAoB,GAC3D,MAAM,CAAC,SAAS,CAAC,cAAc;CAgDnC"}

package/es/language/lsp/completion-provider.js

@@ -196,7 +196,7 @@ export var CompletionProvider = /*#__PURE__*/function (_LangaugeFeatureProvi) {
     }();
     _this.resolveCompletionItem = /*#__PURE__*/function () {
       var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(item, token) {
-        var original, itemResult, resolve;
+        var original, lspConnection, itemResult, resolve;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -208,18 +208,22 @@ export var CompletionProvider = /*#__PURE__*/function (_LangaugeFeatureProvi) {
               return _context4.abrupt("return");
             case 3:
               _context4.next = 5;
-              return _this.lspConnection.clientRequests['completionItem/resolve'].request(original);
+              return _this.getLSPConnection();
             case 5:
+              lspConnection = _context4.sent;
+              _context4.next = 8;
+              return lspConnection.clientRequests['completionItem/resolve'].request(original);
+            case 8:
               itemResult = _context4.sent;
               if (!token.isCancellationRequested) {
-                _context4.next = 8;
+                _context4.next = 11;
                 break;
               }
               return _context4.abrupt("return");
-            case 8:
+            case 11:
               resolve = _this.transformCompletion(itemResult, item.range);
               return _context4.abrupt("return", resolve);
-            case 10:
+            case 13:
             case "end":
               return _context4.stop();
           }

package/es/language/lsp/diagnostic-provider.d.ts

@@ -1,5 +1,5 @@
 import type { LibroService } from '@difizen/libro-core';
-import type { LSPConnection, VirtualDocument } from '@difizen/libro-lsp';
+import type { ILSPDocumentConnectionManager } from '@difizen/libro-lsp';
 import { DisposableCollection } from '@difizen/mana-app';
 import type { Disposable } from '@difizen/mana-app';
 import * as monaco from '@difizen/monaco-editor-core';
@@ -12,7 +12,7 @@ export declare enum MarkerSeverity {
 }
 export declare class DiagnosticProvider extends LangaugeFeatureProvider implements Disposable {
     protected toDispose: DisposableCollection;
-    constructor(libroService: LibroService, lspConnection: LSPConnection, virtualDocument: VirtualDocument);
+    constructor(libroService: LibroService, lspDocumentConnectionManager: ILSPDocumentConnectionManager);
     protected diagnosticList: {
         model: monaco.editor.ITextModel;
         markers: monaco.editor.IMarkerData[];

package/es/language/lsp/diagnostic-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diagnostic-provider.d.ts","sourceRoot":"","sources":["../../../src/language/lsp/diagnostic-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AAKtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAEzE,oBAAY,cAAc;IACxB,IAAI,IAAI;IACR,IAAI,IAAI;IACR,OAAO,IAAI;IACX,KAAK,IAAI;CACV;AASD,qBAAa,kBAAmB,SAAQ,uBAAwB,YAAW,UAAU;IACnF,SAAS,CAAC,SAAS,uBAA8B;gBAE/C,YAAY,EAAE,YAAY,EAC1B,aAAa,EAAE,aAAa,EAC5B,eAAe,EAAE,eAAe;IAMlC,SAAS,CAAC,cAAc,EAAE;QACxB,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;QAChC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;KACtC,EAAE,CAAM;IAET,SAAS,CAAC,aAAa,CACrB,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,EAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW;IAgBnC,SAAS,CAAC,eAAe;IAazB,SAAS,CAAC,iBAAiB;IAOrB,iBAAiB;IAuEvB,QAAQ,UAAS;IACjB,OAAO;CAQR"}
+{"version":3,"file":"diagnostic-provider.d.ts","sourceRoot":"","sources":["../../../src/language/lsp/diagnostic-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AAKtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAEzE,oBAAY,cAAc;IACxB,IAAI,IAAI;IACR,IAAI,IAAI;IACR,OAAO,IAAI;IACX,KAAK,IAAI;CACV;AASD,qBAAa,kBAAmB,SAAQ,uBAAwB,YAAW,UAAU;IACnF,SAAS,CAAC,SAAS,uBAA8B;gBAE/C,YAAY,EAAE,YAAY,EAC1B,4BAA4B,EAAE,6BAA6B;IAM7D,SAAS,CAAC,cAAc,EAAE;QACxB,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;QAChC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;KACtC,EAAE,CAAM;IAET,SAAS,CAAC,aAAa,CACrB,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,EAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW;IAgBnC,SAAS,CAAC,eAAe;IAazB,SAAS,CAAC,iBAAiB;IAOrB,iBAAiB;IA+EvB,QAAQ,UAAS;IACjB,OAAO;CAQR"}

package/es/language/lsp/diagnostic-provider.js

@@ -36,10 +36,10 @@ var vererityMap = {
 export var DiagnosticProvider = /*#__PURE__*/function (_LangaugeFeatureProvi) {
   _inherits(DiagnosticProvider, _LangaugeFeatureProvi);
   var _super = _createSuper(DiagnosticProvider);
-  function DiagnosticProvider(libroService, lspConnection, virtualDocument) {
+  function DiagnosticProvider(libroService, lspDocumentConnectionManager) {
     var _this;
     _classCallCheck(this, DiagnosticProvider);
-    _this = _super.call(this, libroService, lspConnection, virtualDocument);
+    _this = _super.call(this, libroService, lspDocumentConnectionManager);
     _this.toDispose = new DisposableCollection();
     _this.diagnosticList = [];
     _this.disposed = false;
@@ -90,71 +90,125 @@ export var DiagnosticProvider = /*#__PURE__*/function (_LangaugeFeatureProvi) {
   }, {
     key: "processDiagnostic",
     value: function () {
-      var _processDiagnostic = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _processDiagnostic = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
         var _this2 = this;
-        var toDispose;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+        var lspConnection, toDispose;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              toDispose = this.lspConnection.serverNotifications['textDocument/publishDiagnostics'].event(function (e) {
-                _this2.diagnosticList = [];
-                e.diagnostics.forEach(function (diagnostic) {
-                  var _editor$monacoEditor, _diagnostic$relatedIn;
-                  var range = diagnostic.range;
-                  // the diagnostic range must be in current editor
-                  var editor = _this2.getEditorFromLSPPosition(range);
-                  if (!editor || editor.getOption('lspEnabled') !== true) {
-                    return;
-                  }
-                  var model = editor === null || editor === void 0 || (_editor$monacoEditor = editor.monacoEditor) === null || _editor$monacoEditor === void 0 ? void 0 : _editor$monacoEditor.getModel();
-                  if (!model) {
-                    return;
-                  }
-                  var editorStart = _this2.virtualDocument.transformVirtualToEditor({
-                    line: range.start.line,
-                    ch: range.start.character,
-                    isVirtual: true
-                  });
-                  var editorEnd = _this2.virtualDocument.transformVirtualToEditor({
-                    line: range.end.line,
-                    ch: range.end.character,
-                    isVirtual: true
-                  });
-                  if (!editorStart || !editorEnd) {
-                    return;
-                  }
-                  var markerRange = new MonacoRange(editorStart.line + 1, editorStart.ch, editorEnd.line + 1, editorEnd.ch);
-                  var marker = {
-                    source: diagnostic.source,
-                    tags: diagnostic.tags,
-                    message: diagnostic.message,
-                    code: String(diagnostic.code),
-                    severity: diagnostic.severity ? vererityMap[diagnostic.severity] : monaco.MarkerSeverity.Info,
-                    relatedInformation: (_diagnostic$relatedIn = diagnostic.relatedInformation) === null || _diagnostic$relatedIn === void 0 ? void 0 : _diagnostic$relatedIn.map(function (item) {
-                      return {
-                        message: item.message,
-                        resource: MonacoUri.parse(item.location.uri),
-                        startLineNumber: markerRange.startLineNumber,
-                        startColumn: markerRange.startColumn,
-                        endLineNumber: markerRange.endLineNumber,
-                        endColumn: markerRange.endColumn
-                      };
-                    }),
-                    startLineNumber: editorStart.line + 1,
-                    startColumn: editorStart.ch + 1,
-                    endLineNumber: editorEnd.line + 1,
-                    endColumn: editorEnd.ch + 1
-                  };
-                  _this2.addDiagnostic(model, marker);
-                });
-                _this2.displayDiagnostic();
-              });
-              this.toDispose.push(toDispose);
+              _context3.next = 2;
+              return this.getLSPConnection();
             case 2:
+              lspConnection = _context3.sent;
+              toDispose = lspConnection.serverNotifications['textDocument/publishDiagnostics'].event( /*#__PURE__*/function () {
+                var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
+                  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                    while (1) switch (_context2.prev = _context2.next) {
+                      case 0:
+                        _this2.diagnosticList = [];
+                        _context2.next = 3;
+                        return Promise.all(e.diagnostics.map( /*#__PURE__*/function () {
+                          var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(diagnostic) {
+                            var _editor$monacoEditor, _diagnostic$relatedIn;
+                            var range, editor, model, virtualDocument, editorStart, editorEnd, markerRange, marker;
+                            return _regeneratorRuntime().wrap(function _callee$(_context) {
+                              while (1) switch (_context.prev = _context.next) {
+                                case 0:
+                                  range = diagnostic.range; // the diagnostic range must be in current editor
+                                  _context.next = 3;
+                                  return _this2.getEditorFromLSPPosition(range);
+                                case 3:
+                                  editor = _context.sent;
+                                  if (!(!editor || editor.getOption('lspEnabled') !== true)) {
+                                    _context.next = 6;
+                                    break;
+                                  }
+                                  return _context.abrupt("return");
+                                case 6:
+                                  model = editor === null || editor === void 0 || (_editor$monacoEditor = editor.monacoEditor) === null || _editor$monacoEditor === void 0 ? void 0 : _editor$monacoEditor.getModel();
+                                  if (model) {
+                                    _context.next = 9;
+                                    break;
+                                  }
+                                  return _context.abrupt("return");
+                                case 9:
+                                  _context.next = 11;
+                                  return _this2.getVirtualDocument();
+                                case 11:
+                                  virtualDocument = _context.sent;
+                                  if (virtualDocument) {
+                                    _context.next = 14;
+                                    break;
+                                  }
+                                  return _context.abrupt("return");
+                                case 14:
+                                  editorStart = virtualDocument.transformVirtualToEditor({
+                                    line: range.start.line,
+                                    ch: range.start.character,
+                                    isVirtual: true
+                                  });
+                                  editorEnd = virtualDocument.transformVirtualToEditor({
+                                    line: range.end.line,
+                                    ch: range.end.character,
+                                    isVirtual: true
+                                  });
+                                  if (!(!editorStart || !editorEnd)) {
+                                    _context.next = 18;
+                                    break;
+                                  }
+                                  return _context.abrupt("return");
+                                case 18:
+                                  markerRange = new MonacoRange(editorStart.line + 1, editorStart.ch, editorEnd.line + 1, editorEnd.ch);
+                                  marker = {
+                                    source: diagnostic.source,
+                                    tags: diagnostic.tags,
+                                    message: diagnostic.message,
+                                    code: String(diagnostic.code),
+                                    severity: diagnostic.severity ? vererityMap[diagnostic.severity] : monaco.MarkerSeverity.Info,
+                                    relatedInformation: (_diagnostic$relatedIn = diagnostic.relatedInformation) === null || _diagnostic$relatedIn === void 0 ? void 0 : _diagnostic$relatedIn.map(function (item) {
+                                      return {
+                                        message: item.message,
+                                        resource: MonacoUri.parse(item.location.uri),
+                                        startLineNumber: markerRange.startLineNumber,
+                                        startColumn: markerRange.startColumn,
+                                        endLineNumber: markerRange.endLineNumber,
+                                        endColumn: markerRange.endColumn
+                                      };
+                                    }),
+                                    startLineNumber: editorStart.line + 1,
+                                    startColumn: editorStart.ch + 1,
+                                    endLineNumber: editorEnd.line + 1,
+                                    endColumn: editorEnd.ch + 1
+                                  };
+                                  _this2.addDiagnostic(model, marker);
+                                case 21:
+                                case "end":
+                                  return _context.stop();
+                              }
+                            }, _callee);
+                          }));
+                          return function (_x2) {
+                            return _ref2.apply(this, arguments);
+                          };
+                        }()));
+                      case 3:
+                        _this2.displayDiagnostic();
+                      case 4:
+                      case "end":
+                        return _context2.stop();
+                    }
+                  }, _callee2);
+                }));
+                return function (_x) {
+                  return _ref.apply(this, arguments);
+                };
+              }());
+              this.toDispose.push(toDispose);
+            case 5:
             case "end":
-              return _context.stop();
+              return _context3.stop();
           }
-        }, _callee, this);
+        }, _callee3, this);
       }));
       function processDiagnostic() {
         return _processDiagnostic.apply(this, arguments);

package/es/language/lsp/format-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"format-provider.d.ts","sourceRoot":"","sources":["../../../src/language/lsp/format-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AAEtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAEzE,qBAAa,cACX,SAAQ,uBACR,YACE,MAAM,CAAC,SAAS,CAAC,8BAA8B,EAC/C,MAAM,CAAC,SAAS,CAAC,mCAAmC;IAEtD,WAAW,SAAqB;IAEhC,mCAAmC,UAC1B,OAAO,MAAM,CAAC,UAAU,SACxB,YAAY,WACV,OAAO,SAAS,CAAC,iBAAiB,SACpC,OAAO,iBAAiB,KAC9B,QAAQ,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC,CAErC;IACF,8BAA8B,UACrB,OAAO,MAAM,CAAC,UAAU,WACtB,OAAO,SAAS,CAAC,iBAAiB,SACpC,OAAO,iBAAiB,KAC9B,QAAQ,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC,CAErC;IAEF,qBAAqB,UACZ,OAAO,MAAM,CAAC,UAAU,SACxB,YAAY,WACV,OAAO,SAAS,CAAC,iBAAiB,SACpC,OAAO,iBAAiB,KAC9B,QAAQ,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC,CAoDrC;CACH"}
+{"version":3,"file":"format-provider.d.ts","sourceRoot":"","sources":["../../../src/language/lsp/format-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AAEtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAEzE,qBAAa,cACX,SAAQ,uBACR,YACE,MAAM,CAAC,SAAS,CAAC,8BAA8B,EAC/C,MAAM,CAAC,SAAS,CAAC,mCAAmC;IAEtD,WAAW,SAAqB;IAEhC,mCAAmC,UAC1B,OAAO,MAAM,CAAC,UAAU,SACxB,YAAY,WACV,OAAO,SAAS,CAAC,iBAAiB,SACpC,OAAO,iBAAiB,KAC9B,QAAQ,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC,CAErC;IACF,8BAA8B,UACrB,OAAO,MAAM,CAAC,UAAU,WACtB,OAAO,SAAS,CAAC,iBAAiB,SACpC,OAAO,iBAAiB,KAC9B,QAAQ,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC,CAErC;IAEF,qBAAqB,UACZ,OAAO,MAAM,CAAC,UAAU,SACxB,YAAY,WACV,OAAO,SAAS,CAAC,iBAAiB,SACpC,OAAO,iBAAiB,KAC9B,QAAQ,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC,CAqDrC;CACH"}

package/es/language/lsp/format-provider.js

@@ -60,7 +60,7 @@ export var FormatProvider = /*#__PURE__*/function (_LangaugeFeatureProvi) {
     }();
     _this.formatDocumentByRange = /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(model, range, options, token) {
-        var provider, doc, result, edits;
+        var provider, doc, lspConnection, result, edits;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -76,7 +76,11 @@ export var FormatProvider = /*#__PURE__*/function (_LangaugeFeatureProvi) {
             case 5:
               doc = provider.virtualDocument;
               _context3.next = 8;
-              return _this.lspConnection.clientRequests['textDocument/rangeFormatting'].request({
+              return _this.getLSPConnection();
+            case 8:
+              lspConnection = _context3.sent;
+              _context3.next = 11;
+              return lspConnection.clientRequests['textDocument/rangeFormatting'].request({
                 // TODO: range transform
                 // TODO: pyright-extend supoport range format
                 range: {
@@ -97,20 +101,20 @@ export var FormatProvider = /*#__PURE__*/function (_LangaugeFeatureProvi) {
                   tabSize: options.tabSize
                 }
               });
-            case 8:
+            case 11:
               result = _context3.sent;
               if (!token.isCancellationRequested) {
-                _context3.next = 11;
+                _context3.next = 14;
                 break;
               }
               return _context3.abrupt("return", []);
-            case 11:
+            case 14:
               if (result) {
-                _context3.next = 13;
+                _context3.next = 16;
                 break;
               }
               return _context3.abrupt("return", []);
-            case 13:
+            case 16:
               edits = result.map(function (item) {
                 return {
                   range: {
@@ -123,7 +127,7 @@ export var FormatProvider = /*#__PURE__*/function (_LangaugeFeatureProvi) {
                 };
               });
               return _context3.abrupt("return", edits);
-            case 15:
+            case 18:
             case "end":
               return _context3.stop();
           }

package/es/language/lsp/language-feature-provider.d.ts

@@ -1,17 +1,22 @@
 import type { LibroService } from '@difizen/libro-core';
-import type { LSPProviderResult } from '@difizen/libro-lsp';
-import type { LSPConnection, VirtualDocument } from '@difizen/libro-lsp';
+import type { ILSPDocumentConnectionManager } from '@difizen/libro-lsp';
+import type { LSPConnection } from '@difizen/libro-lsp';
 import type monaco from '@difizen/monaco-editor-core';
 import type * as lsp from 'vscode-languageserver-protocol';
 import { LibroE2Editor } from '../../libro-e2-editor.js';
 export declare class LangaugeFeatureProvider {
     protected libroService: LibroService;
-    protected lspProvider?: LSPProviderResult;
-    protected lspConnection: LSPConnection;
-    virtualDocument: VirtualDocument;
-    constructor(libroService: LibroService, lspConnection: LSPConnection, virtualDocument: VirtualDocument);
+    lspDocumentConnectionManager: ILSPDocumentConnectionManager;
+    constructor(libroService: LibroService, lspDocumentConnectionManager: ILSPDocumentConnectionManager);
+    getVirtualDocument(): Promise<import("@difizen/libro-lsp").VirtualDocument | null | undefined>;
+    getLSPConnection(): Promise<LSPConnection>;
+    /**
+     * find cell editor from active notebook by model uri
+     * @param model
+     * @returns
+     */
     protected getEditorByModel(model: monaco.editor.ITextModel): LibroE2Editor | undefined;
-    protected getEditorFromLSPPosition(range: lsp.Range): LibroE2Editor | undefined;
-    protected getProvider(model: monaco.editor.ITextModel): Promise<LSPProviderResult | undefined>;
+    protected getEditorFromLSPPosition(range: lsp.Range): Promise<LibroE2Editor | undefined>;
+    protected getProvider(model: monaco.editor.ITextModel): Promise<import("@difizen/libro-lsp").LSPProviderResult | undefined>;
 }
 //# sourceMappingURL=language-feature-provider.d.ts.map

package/es/language/lsp/language-feature-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"language-feature-provider.d.ts","sourceRoot":"","sources":["../../../src/language/lsp/language-feature-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AACtD,OAAO,KAAK,KAAK,GAAG,MAAM,gCAAgC,CAAC;AAE3D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,qBAAa,uBAAuB;IAClC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IACrC,SAAS,CAAC,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAC1C,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IACvC,eAAe,EAAE,eAAe,CAAC;gBAE/B,YAAY,EAAE,YAAY,EAC1B,aAAa,EAAE,aAAa,EAC5B,eAAe,EAAE,eAAe;IAOlC,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU;IAoB1D,SAAS,CAAC,wBAAwB,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK;cAanC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU;CAW5D"}
+{"version":3,"file":"language-feature-provider.d.ts","sourceRoot":"","sources":["../../../src/language/lsp/language-feature-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AACtD,OAAO,KAAK,KAAK,GAAG,MAAM,gCAAgC,CAAC;AAE3D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,qBAAa,uBAAuB;IAClC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IACrC,4BAA4B,EAAE,6BAA6B,CAAC;gBAE1D,YAAY,EAAE,YAAY,EAC1B,4BAA4B,EAAE,6BAA6B;IAMvD,kBAAkB;IAkBlB,gBAAgB;IActB;;;;OAIG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU;cAoB1C,wBAAwB,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK;cAmBzC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU;CAU5D"}

package/es/language/lsp/language-feature-provider.js

@@ -10,13 +10,91 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { EditorCellView } from '@difizen/libro-core';
 import { LibroE2Editor } from "../../libro-e2-editor.js";
 export var LangaugeFeatureProvider = /*#__PURE__*/function () {
-  function LangaugeFeatureProvider(libroService, lspConnection, virtualDocument) {
+  function LangaugeFeatureProvider(libroService, lspDocumentConnectionManager) {
     _classCallCheck(this, LangaugeFeatureProvider);
     this.libroService = libroService;
-    this.lspConnection = lspConnection;
-    this.virtualDocument = virtualDocument;
+    this.lspDocumentConnectionManager = lspDocumentConnectionManager;
   }
   _createClass(LangaugeFeatureProvider, [{
+    key: "getVirtualDocument",
+    value: function () {
+      var _getVirtualDocument = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var libroView, adapter, virtualDocument;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              libroView = this.libroService.active;
+              if (libroView) {
+                _context.next = 3;
+                break;
+              }
+              return _context.abrupt("return");
+            case 3:
+              _context.next = 5;
+              return this.lspDocumentConnectionManager.ready;
+            case 5:
+              adapter = this.lspDocumentConnectionManager.adapters.get(libroView.model.id);
+              if (adapter) {
+                _context.next = 8;
+                break;
+              }
+              throw new Error('no adapter');
+            case 8:
+              _context.next = 10;
+              return adapter.ready;
+            case 10:
+              // Get the associated virtual document of the opened document
+              virtualDocument = adapter.virtualDocument;
+              return _context.abrupt("return", virtualDocument);
+            case 12:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function getVirtualDocument() {
+        return _getVirtualDocument.apply(this, arguments);
+      }
+      return getVirtualDocument;
+    }()
+  }, {
+    key: "getLSPConnection",
+    value: function () {
+      var _getLSPConnection = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        var virtualDocument, lspConnection;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
+              return this.getVirtualDocument();
+            case 2:
+              virtualDocument = _context2.sent;
+              if (virtualDocument) {
+                _context2.next = 5;
+                break;
+              }
+              throw new Error('no virtualDocument');
+            case 5:
+              // Get the LSP connection of the virtual document.
+              lspConnection = this.lspDocumentConnectionManager.connections.get(virtualDocument.uri);
+              return _context2.abrupt("return", lspConnection);
+            case 7:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function getLSPConnection() {
+        return _getLSPConnection.apply(this, arguments);
+      }
+      return getLSPConnection;
+    }()
+    /**
+     * find cell editor from active notebook by model uri
+     * @param model
+     * @returns
+     */
+  }, {
     key: "getEditorByModel",
     value: function getEditorByModel(model) {
       var _this$libroService$ac;
@@ -39,47 +117,74 @@ export var LangaugeFeatureProvider = /*#__PURE__*/function () {
     }
   }, {
     key: "getEditorFromLSPPosition",
-    value: function getEditorFromLSPPosition(range) {
-      var currentEditor = this.virtualDocument.getEditorAtVirtualLine({
-        line: range.start.line,
-        ch: range.start.character,
-        isVirtual: true
-      });
-      var editor = currentEditor.getEditor();
-      if (editor instanceof LibroE2Editor) {
-        return editor;
+    value: function () {
+      var _getEditorFromLSPPosition = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(range) {
+        var virtualDocument, currentEditor, _editor;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.prev = 0;
+              _context3.next = 3;
+              return this.getVirtualDocument();
+            case 3:
+              virtualDocument = _context3.sent;
+              currentEditor = virtualDocument === null || virtualDocument === void 0 ? void 0 : virtualDocument.getEditorAtVirtualLine({
+                line: range.start.line,
+                ch: range.start.character,
+                isVirtual: true
+              });
+              _editor = currentEditor === null || currentEditor === void 0 ? void 0 : currentEditor.getEditor();
+              if (!(_editor instanceof LibroE2Editor)) {
+                _context3.next = 8;
+                break;
+              }
+              return _context3.abrupt("return", _editor);
+            case 8:
+              return _context3.abrupt("return");
+            case 11:
+              _context3.prev = 11;
+              _context3.t0 = _context3["catch"](0);
+              console.warn(_context3.t0);
+              return _context3.abrupt("return");
+            case 15:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this, [[0, 11]]);
+      }));
+      function getEditorFromLSPPosition(_x) {
+        return _getEditorFromLSPPosition.apply(this, arguments);
       }
-      return;
-    }
+      return getEditorFromLSPPosition;
+    }()
   }, {
     key: "getProvider",
     value: function () {
-      var _getProvider = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(model) {
+      var _getProvider = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(model) {
         var _editor$lspProvider;
         var editor, provider;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               editor = this.getEditorByModel(model);
               if (editor) {
-                _context.next = 3;
+                _context4.next = 3;
                 break;
               }
-              return _context.abrupt("return");
+              return _context4.abrupt("return");
             case 3:
-              _context.next = 5;
+              _context4.next = 5;
               return (_editor$lspProvider = editor.lspProvider) === null || _editor$lspProvider === void 0 ? void 0 : _editor$lspProvider.call(editor);
             case 5:
-              provider = _context.sent;
-              this.lspProvider = provider;
-              return _context.abrupt("return", provider);
-            case 8:
+              provider = _context4.sent;
+              return _context4.abrupt("return", provider);
+            case 7:
             case "end":
-              return _context.stop();
+              return _context4.stop();
           }
-        }, _callee, this);
+        }, _callee4, this);
       }));
-      function getProvider(_x) {
+      function getProvider(_x2) {
         return _getProvider.apply(this, arguments);
       }
       return getProvider;