@difizen/libro-language-client 0.2.0 → 0.2.1

package/es/libro-language-client-contribution.js

@@ -1,5 +1,5 @@
 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, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
+var _dec, _dec2, _dec3, _dec4, _dec5, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4;
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
@@ -14,18 +14,25 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 { EditorCellView, ILibroWorkspaceService, LibroService } from '@difizen/libro-core';
+import { ExecutableNotebookModel } from '@difizen/libro-kernel';
 import { ApplicationContribution, inject, singleton } from '@difizen/mana-app';
+import * as monaco from '@difizen/monaco-editor-core';
+import { URI } from 'vscode-uri';
 import { CloseAction, ErrorAction } from "./common/api.js";
 import { LSPEnv } from "./common/vscodeAdaptor/lspEnv.js";
 import { workspace } from "./common/vscodeAdaptor/vscodeAdaptor.js";
 import { LibroLanguageClientManager } from "./libro-language-client-manager.js";
+import { getCellURI, toEditorRange, toMonacoPosition } from "./util.js";
 export var LibroLanguageClientContribution = (_dec = singleton({
   contrib: [ApplicationContribution]
-}), _dec2 = inject(LibroLanguageClientManager), _dec3 = inject(LSPEnv), _dec(_class = (_class2 = /*#__PURE__*/function () {
+}), _dec2 = inject(ILibroWorkspaceService), _dec3 = inject(LibroLanguageClientManager), _dec4 = inject(LSPEnv), _dec5 = inject(LibroService), _dec(_class = (_class2 = /*#__PURE__*/function () {
   function LibroLanguageClientContribution() {
     _classCallCheck(this, LibroLanguageClientContribution);
-    _initializerDefineProperty(this, "libroLanguageClientManager", _descriptor, this);
-    _initializerDefineProperty(this, "lspEnv", _descriptor2, this);
+    _initializerDefineProperty(this, "libroWorkspaceService", _descriptor, this);
+    _initializerDefineProperty(this, "libroLanguageClientManager", _descriptor2, this);
+    _initializerDefineProperty(this, "lspEnv", _descriptor3, this);
+    _initializerDefineProperty(this, "libroService", _descriptor4, this);
   }
   _createClass(LibroLanguageClientContribution, [{
     key: "onViewStart",
@@ -36,7 +43,8 @@ export var LibroLanguageClientContribution = (_dec = singleton({
             case 0:
               // not block
               this.startLanguageClients();
-            case 1:
+              this.setupEditorOpener();
+            case 2:
             case "end":
               return _context.stop();
           }
@@ -51,27 +59,31 @@ export var LibroLanguageClientContribution = (_dec = singleton({
     key: "startLanguageClients",
     value: function () {
       var _startLanguageClients = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        var _this = this;
         var serverIds, _iterator, _step, serverId;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return this.lspEnv.ready;
+              return this.libroWorkspaceService.ready;
             case 2:
               _context2.next = 4;
-              return this.libroLanguageClientManager.getServers();
+              return this.lspEnv.ready;
             case 4:
+              _context2.next = 6;
+              return this.libroLanguageClientManager.getServers();
+            case 6:
               serverIds = _context2.sent;
               _iterator = _createForOfIteratorHelper(serverIds);
-              _context2.prev = 6;
+              _context2.prev = 8;
               _iterator.s();
-            case 8:
+            case 10:
               if ((_step = _iterator.n()).done) {
-                _context2.next = 14;
+                _context2.next = 16;
                 break;
               }
               serverId = _step.value;
-              _context2.next = 12;
+              _context2.next = 14;
               return this.libroLanguageClientManager.getOrCreateLanguageClient(serverId, {
                 name: "".concat(serverId, " Language Client"),
                 clientOptions: {
@@ -92,50 +104,116 @@ export var LibroLanguageClientContribution = (_dec = singleton({
                       };
                     }
                   },
-                  // pyright requires a workspace folder to be present, otherwise it will not work
-                  // workspaceFolder: {
-                  //   index: 0,
-                  //   name: 'workspace',
-                  //   uri: URI.parse('/examples'), // abs path
-                  // },
                   synchronize: {
                     fileEvents: [workspace.createFileSystemWatcher('**', false)]
                   }
                 }
               });
-            case 12:
-              _context2.next = 8;
-              break;
             case 14:
-              _context2.next = 19;
+              _context2.next = 10;
               break;
             case 16:
-              _context2.prev = 16;
-              _context2.t0 = _context2["catch"](6);
+              _context2.next = 21;
+              break;
+            case 18:
+              _context2.prev = 18;
+              _context2.t0 = _context2["catch"](8);
               _iterator.e(_context2.t0);
-            case 19:
-              _context2.prev = 19;
+            case 21:
+              _context2.prev = 21;
               _iterator.f();
-              return _context2.finish(19);
-            case 22:
+              return _context2.finish(21);
+            case 24:
+              this.libroLanguageClientManager.getFeatureStatus('textDocument/formatting').then(function (status) {
+                _this.libroService.hasFormatter = status;
+                return;
+              }).catch(function () {
+                return;
+              });
+            case 25:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[6, 16, 19, 22]]);
+        }, _callee2, this, [[8, 18, 21, 24]]);
       }));
       function startLanguageClients() {
         return _startLanguageClients.apply(this, arguments);
       }
       return startLanguageClients;
     }()
+  }, {
+    key: "setupEditorOpener",
+    value: function setupEditorOpener() {
+      var _this2 = this;
+      monaco.editor.registerEditorOpener({
+        openCodeEditor: function openCodeEditor(source, resource, selectionOrPosition) {
+          var _source$getModel;
+          // simulate openening a new browser tab for our own type (open definition of alert)
+          var model = monaco.editor.getModel(resource);
+          if ((model === null || model === void 0 ? void 0 : model.id) === ((_source$getModel = source.getModel()) === null || _source$getModel === void 0 ? void 0 : _source$getModel.id)) {
+            return true;
+          }
+          var libroView = Array.from(_this2.libroService.getViewCache().values()).find(function (item) {
+            return ExecutableNotebookModel.is(item.model) && URI.parse(item.model.filePath).path === resource.path;
+          });
+          if (!libroView) {
+            return false;
+          }
+          var cell = libroView.model.cells.find(function (item) {
+            return ExecutableNotebookModel.is(libroView.model) && getCellURI(libroView.model, item.model).toString() === decodeURIComponent(resource.toString());
+          });
+          if (EditorCellView.is(cell)) {
+            var _cell$editor, _line;
+            libroView.selectCell(cell);
+            (_cell$editor = cell.editor) === null || _cell$editor === void 0 || _cell$editor.focus();
+            var line = 0;
+            if (monaco.Range.isIRange(selectionOrPosition)) {
+              var _cell$editor2, _cell$editor3;
+              (_cell$editor2 = cell.editor) === null || _cell$editor2 === void 0 || _cell$editor2.revealSelection(toEditorRange(selectionOrPosition));
+              (_cell$editor3 = cell.editor) === null || _cell$editor3 === void 0 || _cell$editor3.setCursorPosition(toEditorRange(selectionOrPosition).start);
+              line = toEditorRange(selectionOrPosition).start.line;
+            } else {
+              var _cell$editor4;
+              (_cell$editor4 = cell.editor) === null || _cell$editor4 === void 0 || _cell$editor4.setCursorPosition(toMonacoPosition(selectionOrPosition));
+              line = toMonacoPosition(selectionOrPosition).line;
+            }
+            libroView.model.scrollToView(cell, ((_line = line) !== null && _line !== void 0 ? _line : 0) * 20);
+            return false;
+          }
+
+          // alternatively set model directly in the editor if you have your own tab/navigation implementation
+          // const model = monaco.editor.getModel(resource);
+          // editor.setModel(model);
+          // if (monaco.Range.isIRange(selectionOrPosition)) {
+          // 	editor.revealRangeInCenterIfOutsideViewport(selectionOrPosition);
+          // 	editor.setSelection(selectionOrPosition);
+          // } else {
+          // 	editor.revealPositionInCenterIfOutsideViewport(selectionOrPosition);
+          // 	editor.setPosition(selectionOrPosition);
+          // }
+
+          return false;
+        }
+      });
+    }
   }]);
   return LibroLanguageClientContribution;
-}(), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "libroLanguageClientManager", [_dec2], {
+}(), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "libroWorkspaceService", [_dec2], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "libroLanguageClientManager", [_dec3], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor3 = _applyDecoratedDescriptor(_class2.prototype, "lspEnv", [_dec4], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "lspEnv", [_dec3], {
+}), _descriptor4 = _applyDecoratedDescriptor(_class2.prototype, "libroService", [_dec5], {
   configurable: true,
   enumerable: true,
   writable: true,

package/es/libro-language-client-manager.d.ts

@@ -11,6 +11,10 @@ export declare class LibroLanguageClientManager {
     protected readonly languageServerManagerFactory: ILanguageServerManagerFactory;
     protected languageServerManager: ILanguageServerManager;
     protected clientMap: Map<string, IConnectionData>;
+    /**
+     * lsp server that support notebook
+     */
+    protected supportedLSPServer: string[];
     init(): void;
     protected serverUri(languageServerId: string): string;
     getServers(language?: string): Promise<import("@difizen/libro-lsp").TLanguageServerId[]>;

package/es/libro-language-client-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"libro-language-client-manager.d.ts","sourceRoot":"","sources":["../src/libro-language-client-manager.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,sBAAsB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AAGnE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,UAAU,eAAe;IACvB,UAAU,EAAE,SAAS,CAAC;IACtB,cAAc,EAAE,mBAAmB,CAAC;CACrC;AAGD,MAAM,MAAM,cAAc,GAAG,yBAAyB,CAAC;AAEvD,qBACa,0BAA0B;IAErC,SAAS,CAAC,QAAQ,CAAC,4BAA4B,EAAE,6BAA6B,CAAC;IAE/E,SAAS,CAAC,qBAAqB,EAAE,sBAAsB,CAAC;IAExD,SAAS,CAAC,SAAS,+BAAsC;IAGzD,IAAI;IAIJ,SAAS,CAAC,SAAS,CAAC,gBAAgB,EAAE,MAAM;IAKtC,UAAU,CAAC,QAAQ,SAAW;IAQ9B,cAAc,CAAC,QAAQ,SAAW;IAQlC,cAAc;IAIpB,IAAI,eAAe,4CAElB;IAED,IAAI,QAAQ,gBAQX;IAEK,yBAAyB,CAC7B,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,0BAA0B;;;;IAYrC,SAAS,CAAC,oBAAoB,QACvB,MAAM,WACF,0BAA0B;;;OAGnC;IAEI,mBAAmB,CAAC,gBAAgB,EAAE,MAAM;IAO5C,sBAAsB;IAMtB,gBAAgB,CACpB,OAAO,EAAE,cAAc,EACvB,QAAQ,SAAW,GAClB,OAAO,CAAC,OAAO,CAAC;CAuBpB"}
+{"version":3,"file":"libro-language-client-manager.d.ts","sourceRoot":"","sources":["../src/libro-language-client-manager.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,sBAAsB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AAGnE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,UAAU,eAAe;IACvB,UAAU,EAAE,SAAS,CAAC;IACtB,cAAc,EAAE,mBAAmB,CAAC;CACrC;AAGD,MAAM,MAAM,cAAc,GAAG,yBAAyB,CAAC;AAEvD,qBACa,0BAA0B;IAErC,SAAS,CAAC,QAAQ,CAAC,4BAA4B,EAAE,6BAA6B,CAAC;IAE/E,SAAS,CAAC,qBAAqB,EAAE,sBAAsB,CAAC;IAExD,SAAS,CAAC,SAAS,+BAAsC;IAEzD;;OAEG;IACH,SAAS,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAA6C;IAGnF,IAAI;IAIJ,SAAS,CAAC,SAAS,CAAC,gBAAgB,EAAE,MAAM;IAKtC,UAAU,CAAC,QAAQ,SAAW;IAQ9B,cAAc,CAAC,QAAQ,SAAW;IAQlC,cAAc;IAIpB,IAAI,eAAe,4CAElB;IAED,IAAI,QAAQ,gBAQX;IAEK,yBAAyB,CAC7B,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,0BAA0B;;;;IAerC,SAAS,CAAC,oBAAoB,QACvB,MAAM,WACF,0BAA0B;;;OAGnC;IAEI,mBAAmB,CAAC,gBAAgB,EAAE,MAAM;IAO5C,sBAAsB;IAMtB,gBAAgB,CACpB,OAAO,EAAE,cAAc,EACvB,QAAQ,SAAW,GAClB,OAAO,CAAC,OAAO,CAAC;CAuBpB"}

package/es/libro-language-client-manager.js

@@ -24,6 +24,10 @@ export var LibroLanguageClientManager = (_dec = singleton(), _dec2 = inject(ILan
     _classCallCheck(this, LibroLanguageClientManager);
     _initializerDefineProperty(this, "languageServerManagerFactory", _descriptor, this);
     this.clientMap = new Map();
+    /**
+     * lsp server that support notebook
+     */
+    this.supportedLSPServer = ['libro-analyzer', 'ruff-lsp', 'pylance'];
     this.createLanguageClient = function (url, options) {
       return LibroLanguageClient.createWebSocketLanguageClient(url, options);
     };
@@ -43,6 +47,7 @@ export var LibroLanguageClientManager = (_dec = singleton(), _dec2 = inject(ILan
     key: "getServers",
     value: function () {
       var _getServers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var _this = this;
         var language,
           serverIds,
           _args = arguments;
@@ -56,7 +61,9 @@ export var LibroLanguageClientManager = (_dec = singleton(), _dec2 = inject(ILan
               serverIds = this.languageServerManager.getMatchingServers({
                 language: language
               });
-              return _context.abrupt("return", serverIds);
+              return _context.abrupt("return", serverIds.filter(function (item) {
+                return _this.supportedLSPServer.includes(item);
+              }));
             case 5:
             case "end":
               return _context.stop();
@@ -141,21 +148,27 @@ export var LibroLanguageClientManager = (_dec = singleton(), _dec2 = inject(ILan
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              if (!this.clientMap.has(languageServerId)) {
+              if (this.supportedLSPServer.includes(languageServerId)) {
                 _context4.next = 2;
                 break;
               }
-              return _context4.abrupt("return", this.clientMap.get(languageServerId));
+              return _context4.abrupt("return");
             case 2:
+              if (!this.clientMap.has(languageServerId)) {
+                _context4.next = 4;
+                break;
+              }
+              return _context4.abrupt("return", this.clientMap.get(languageServerId));
+            case 4:
               url = this.serverUri(languageServerId);
-              _context4.next = 5;
+              _context4.next = 7;
               return this.createLanguageClient(url, options);
-            case 5:
+            case 7:
               client = _context4.sent;
               this.clientMap.set(languageServerId, client);
               this.refreshRunning();
               return _context4.abrupt("return", client);
-            case 9:
+            case 11:
             case "end":
               return _context4.stop();
           }
@@ -195,7 +208,7 @@ export var LibroLanguageClientManager = (_dec = singleton(), _dec2 = inject(ILan
     key: "closeAllLanguageClient",
     value: function () {
       var _closeAllLanguageClient = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        var _this = this;
+        var _this2 = this;
         var servers;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
@@ -206,7 +219,7 @@ export var LibroLanguageClientManager = (_dec = singleton(), _dec2 = inject(ILan
               servers = _context6.sent;
               _context6.next = 5;
               return Promise.all(servers.map(function (server) {
-                return _this.closeLanguageClient(server);
+                return _this2.closeLanguageClient(server);
               }));
             case 5:
               this.refreshRunning();
@@ -225,7 +238,7 @@ export var LibroLanguageClientManager = (_dec = singleton(), _dec2 = inject(ILan
     key: "getFeatureStatus",
     value: function () {
       var _getFeatureStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(feature) {
-        var _this2 = this;
+        var _this3 = this;
         var language,
           featureEnabled,
           serverids,
@@ -240,8 +253,8 @@ export var LibroLanguageClientManager = (_dec = singleton(), _dec2 = inject(ILan
             case 4:
               serverids = _context7.sent;
               serverids.forEach(function (id) {
-                var _this2$clientMap$get;
-                var featureState = (_this2$clientMap$get = _this2.clientMap.get(id)) === null || _this2$clientMap$get === void 0 ? void 0 : _this2$clientMap$get.languageClient.getFeature(feature).getState();
+                var _this3$clientMap$get;
+                var featureState = (_this3$clientMap$get = _this3.clientMap.get(id)) === null || _this3$clientMap$get === void 0 ? void 0 : _this3$clientMap$get.languageClient.getFeature(feature).getState();
                 if ((featureState === null || featureState === void 0 ? void 0 : featureState.kind) === 'document' && featureState.registrations === true) {
                   featureEnabled = true;
                 }

package/es/util.d.ts

@@ -0,0 +1,9 @@
+import type { IPosition, IRange } from '@difizen/libro-code-editor';
+import type { CellModel } from '@difizen/libro-core';
+import type { ExecutableNotebookModel } from '@difizen/libro-kernel';
+import { URI } from '@difizen/mana-app';
+import type * as monaco from '@difizen/monaco-editor-core';
+export declare const getCellURI: (libroModel: ExecutableNotebookModel, cellModel: CellModel) => URI;
+export declare const toEditorRange: (range: monaco.IRange) => IRange;
+export declare const toMonacoPosition: (position: monaco.IPosition | undefined) => IPosition;
+//# sourceMappingURL=util.d.ts.map

package/es/util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,MAAM,6BAA6B,CAAC;AAI3D,eAAO,MAAM,UAAU,eACT,uBAAuB,aACxB,SAAS,KACnB,GAKF,CAAC;AAEF,eAAO,MAAM,aAAa,UAAW,aAAa,KAAG,MAWpD,CAAC;AAEF,eAAO,MAAM,gBAAgB,aAAc,gBAAgB,GAAG,SAAS,KAAG,SAWzE,CAAC"}

package/es/util.js

@@ -0,0 +1,32 @@
+import { URI } from '@difizen/mana-app';
+import { LibroCellURIScheme } from "./constants.js";
+export var getCellURI = function getCellURI(libroModel, cellModel) {
+  var uri = new URI(libroModel.filePath);
+  uri = URI.withScheme(uri, LibroCellURIScheme);
+  uri = URI.withQuery(uri, "cellid=".concat(cellModel.id));
+  return uri;
+};
+export var toEditorRange = function toEditorRange(range) {
+  return {
+    start: {
+      line: range.startLineNumber - 1,
+      column: range.startColumn - 1
+    },
+    end: {
+      line: range.endLineNumber - 1,
+      column: range.endColumn - 1
+    }
+  };
+};
+export var toMonacoPosition = function toMonacoPosition(position) {
+  if (!position) {
+    return {
+      column: 0,
+      line: 0
+    };
+  }
+  return {
+    column: (position === null || position === void 0 ? void 0 : position.column) - 1,
+    line: (position === null || position === void 0 ? void 0 : position.lineNumber) - 1
+  };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-language-client",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "",
   "keywords": [
     "libro",
@@ -32,10 +32,11 @@
     "src"
   ],
   "dependencies": {
-    "@difizen/libro-core": "^0.2.0",
-    "@difizen/libro-kernel": "^0.2.0",
-    "@difizen/libro-common": "^0.2.0",
-    "@difizen/libro-lsp": "^0.2.0",
+    "@difizen/libro-core": "^0.2.1",
+    "@difizen/libro-code-editor": "^0.2.1",
+    "@difizen/libro-kernel": "^0.2.1",
+    "@difizen/libro-common": "^0.2.1",
+    "@difizen/libro-lsp": "^0.2.1",
     "@difizen/mana-app": "latest",
     "@difizen/mana-common": "latest",
     "uuid": "^9.0.0",
@@ -46,7 +47,7 @@
     "vscode-uri": "^3.0.8"
   },
   "peerDependencies": {
-    "react": "^18.2.0"
+    "react": ">=16"
   },
   "devDependencies": {
     "@types/react": "^18.2.25",

package/src/common/codeConverter.ts

@@ -4,6 +4,7 @@
  * ------------------------------------------------------------------------------------------ */
 
 import * as proto from '@difizen/vscode-languageserver-protocol';
+import type { LocationLink } from 'vscode';
 import type {
   InlineCompletionContext,
   InlayHint,
@@ -46,6 +47,8 @@ import type {
   TextEdit,
   Uri,
   SymbolInformation as VSymbolInformation,
+  Definition,
+  DefinitionLink,
 } from 'vscode';
 
 import ProtocolCallHierarchyItem from './protocolCallHierarchyItem.js';
@@ -60,6 +63,7 @@ import ProtocolTypeHierarchyItem from './protocolTypeHierarchyItem.js';
 import WorkspaceSymbol from './protocolWorkspaceSymbol.js';
 import * as async from './utils/async.js';
 import * as Is from './utils/is.js';
+import { isNumber } from './vscodeAdaptor/hostTypeUtil.js';
 import type { SymbolInformation } from './vscodeAdaptor/vscodeAdaptor.js';
 import {
   SymbolKind,
@@ -172,11 +176,25 @@ export interface Converter {
 
   asRanges(values: readonly Range[]): proto.Range[];
 
+  asDefinitionResult(item: Definition): proto.Definition;
+  asDefinitionResult(item: DefinitionLink[]): proto.Definition;
+  asDefinitionResult(item: undefined | null): undefined;
+  asDefinitionResult(
+    item: Definition | DefinitionLink[] | undefined | null,
+  ): proto.Definition | undefined;
+  asDefinitionResult(
+    item: Definition | DefinitionLink[] | undefined | null,
+  ): proto.Definition | undefined;
+
   asLocation(value: null): null;
   asLocation(value: undefined): undefined;
   asLocation(value: Location): proto.Location;
   asLocation(value: Location | undefined | null): proto.Location | undefined | null;
 
+  asLocationLink(item: undefined | null): undefined;
+  asLocationLink(item: LocationLink): proto.LocationLink;
+  asLocationLink(item: LocationLink | undefined | null): proto.LocationLink | undefined;
+
   asDiagnosticSeverity(value: DiagnosticSeverity): number;
   asDiagnosticTag(value: DiagnosticTag): number | undefined;
 
@@ -215,6 +233,8 @@ export interface Converter {
   ): Promise<proto.CodeActionContext>;
   asCodeActionContextSync(context: CodeActionContext): proto.CodeActionContext;
 
+  asCodeActionList(actions: (Command | CodeAction)[]): Promise<proto.CodeAction[]>;
+
   asInlineValueContext(context: InlineValueContext): proto.InlineValueContext;
 
   asCommand(item: Command): proto.Command;
@@ -250,6 +270,15 @@ export interface Converter {
   asInlineCompletionContext(
     context: InlineCompletionContext,
   ): proto.InlineCompletionContext;
+
+  asSignatureHelpResult(item: undefined | null): undefined;
+  asSignatureHelpResult(item: SignatureHelp): proto.SignatureHelp;
+  asSignatureHelpResult(
+    item: SignatureHelp | undefined | null,
+  ): proto.SignatureHelp | undefined;
+  asSignatureHelpResult(
+    item: SignatureHelp | undefined | null,
+  ): proto.SignatureHelp | undefined;
 }
 
 export interface URIConverter {
@@ -623,6 +652,63 @@ export function createConverter(uriConverter?: URIConverter): Converter {
     return values.map(asRange as (item: Range) => proto.Range);
   }
 
+  function asLocationLink(item: undefined | null): undefined;
+  function asLocationLink(item: LocationLink): proto.LocationLink;
+  function asLocationLink(
+    item: LocationLink | undefined | null,
+  ): proto.LocationLink | undefined {
+    if (!item) {
+      return undefined;
+    }
+    const result: proto.LocationLink = {
+      targetUri: item.targetUri.toString(),
+      targetRange: asRange(item.targetSelectionRange)!, // See issue: https://github.com/Microsoft/vscode/issues/58649
+      originSelectionRange: asRange(item.originSelectionRange)!,
+      targetSelectionRange: asRange(item.targetSelectionRange)!,
+    };
+    if (!result.targetSelectionRange) {
+      throw new Error(`targetSelectionRange must not be undefined or null`);
+    }
+    return result;
+  }
+
+  // Function to check if an object is a LocationLink
+  function isLocationLink(object: any): object is LocationLink {
+    return (
+      object !== undefined &&
+      'targetUri' in object &&
+      'targetRange' in object &&
+      'targetSelectionRange' in object
+    );
+  }
+
+  function asDefinitionResult(item: Definition): proto.Definition;
+  function asDefinitionResult(item: DefinitionLink[]): proto.Definition;
+  function asDefinitionResult(item: undefined | null): undefined;
+  function asDefinitionResult(
+    item: Definition | DefinitionLink[] | undefined | null,
+  ): proto.Definition | proto.DefinitionLink[] | undefined;
+  function asDefinitionResult(
+    item: Definition | DefinitionLink[] | undefined | null,
+  ): proto.Definition | proto.DefinitionLink[] | undefined {
+    if (!item) {
+      return undefined;
+    }
+    if (Array.isArray(item)) {
+      if (item.length === 0) {
+        return undefined;
+      } else if (isLocationLink(item[0])) {
+        const links: LocationLink[] = item as unknown as LocationLink[];
+        return links.map((location) => asLocationLink(location));
+      } else {
+        const locations: Location[] = item as Location[];
+        return locations.map((location) => asLocation(location));
+      }
+    } else {
+      return asLocation(item);
+    }
+  }
+
   function asLocation(value: Location): proto.Location;
   function asLocation(value: undefined): undefined;
   function asLocation(value: null): null;
@@ -990,10 +1076,14 @@ export function createConverter(uriConverter?: URIConverter): Converter {
   }
 
   async function asCodeAction(
-    item: CodeAction,
+    item: Command | CodeAction,
     token?: CancellationToken,
   ): Promise<proto.CodeAction> {
     const result = proto.CodeAction.create(item.title);
+    if (proto.Command.is(item)) {
+      result.command = asCommand(item);
+      return result;
+    }
     if (item instanceof ProtocolCodeAction && item.data !== undefined) {
       result.data = item.data;
     }
@@ -1105,6 +1195,12 @@ export function createConverter(uriConverter?: URIConverter): Converter {
     return item.value;
   }
 
+  async function asCodeActionList(
+    actions: (Command | CodeAction)[],
+  ): Promise<proto.CodeAction[]> {
+    return Promise.all(actions.map(async (action) => await asCodeAction(action)));
+  }
+
   function asInlineValueContext(context: InlineValueContext): proto.InlineValueContext {
     return proto.InlineValueContext.create(
       context.frameId,
@@ -1350,6 +1446,38 @@ export function createConverter(uriConverter?: URIConverter): Converter {
     return result;
   }
 
+  function asSignatureHelpResult(item: undefined | null): undefined;
+  function asSignatureHelpResult(item: SignatureHelp): proto.SignatureHelp;
+  function asSignatureHelpResult(
+    item: SignatureHelp | undefined | null,
+  ): proto.SignatureHelp | undefined;
+  function asSignatureHelpResult(
+    item: SignatureHelp | undefined | null,
+  ): proto.SignatureHelp | undefined {
+    if (!item) {
+      return undefined;
+    }
+    const result = <proto.SignatureHelp>{};
+    if (isNumber(item.activeSignature)) {
+      result.activeSignature = item.activeSignature;
+    } else {
+      // activeSignature was optional in the past
+      result.activeSignature = 0;
+    }
+    if (isNumber(item.activeParameter)) {
+      result.activeParameter = item.activeParameter;
+    } else {
+      // activeParameter was optional in the past
+      result.activeParameter = 0;
+    }
+    if (item.signatures) {
+      result.signatures = asSignatureInformations(item.signatures);
+    } else {
+      result.signatures = [];
+    }
+    return result;
+  }
+
   return {
     asUri,
     asTextDocumentIdentifier,
@@ -1405,5 +1533,9 @@ export function createConverter(uriConverter?: URIConverter): Converter {
     asWorkspaceSymbol,
     asInlineCompletionParams,
     asInlineCompletionContext,
+    asDefinitionResult,
+    asLocationLink,
+    asSignatureHelpResult,
+    asCodeActionList,
   };
 }