@difizen/libro-jupyter 0.1.18 → 0.1.19

package/es/cell/jupyter-code-cell-view.d.ts

@@ -1,21 +1,14 @@
 /// <reference types="react" resolution-mode="require"/>
 import { LibroCodeCellView } from '@difizen/libro-code-cell';
-import { CodeEditorManager } from '@difizen/libro-code-editor';
 import type { CodeEditorViewOptions, CompletionProvider, TooltipProvider } from '@difizen/libro-code-editor';
-import type { CellViewOptions } from '@difizen/libro-core';
-import { CellService } from '@difizen/libro-core';
-import type { LSPProvider } from '@difizen/libro-lsp';
-import { ILSPDocumentConnectionManager } from '@difizen/libro-lsp';
-import { ViewManager } from '@difizen/mana-app';
+import type { LibroJupyterView } from '../libro-jupyter-view.js';
 import type { JupyterCodeCellModel } from './jupyter-code-cell-model.js';
 export declare class JupyterCodeCellView extends LibroCodeCellView {
+    parent: LibroJupyterView;
     view: import("react").ForwardRefExoticComponent<import("react").RefAttributes<HTMLDivElement>>;
     model: JupyterCodeCellModel;
-    protected readonly lspDocumentConnectionManager: ILSPDocumentConnectionManager;
-    constructor(options: CellViewOptions, cellService: CellService, viewManager: ViewManager, lspDocumentConnectionManager: ILSPDocumentConnectionManager, codeEditorManager: CodeEditorManager);
     clearExecution: () => void;
     protected getEditorOption(): CodeEditorViewOptions;
-    lspProvider: LSPProvider;
     tooltipProvider: TooltipProvider;
     completionProvider: CompletionProvider;
     run(): Promise<boolean>;

package/es/cell/jupyter-code-cell-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jupyter-code-cell-view.d.ts","sourceRoot":"","sources":["../../src/cell/jupyter-code-cell-view.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAkB,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EACV,qBAAqB,EACrB,kBAAkB,EAElB,eAAe,EAEhB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,KAAK,EAAiB,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AAEnE,OAAO,EAAsB,WAAW,EAAc,MAAM,mBAAmB,CAAC;AAQhF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAkBzE,qBAEa,mBAAoB,SAAQ,iBAAiB;IAC/C,IAAI,2FAA4B;IACjC,KAAK,EAAE,oBAAoB,CAAC;IAEpC,SAAS,CAAC,QAAQ,CAAC,4BAA4B,EAAE,6BAA6B,CAAC;gBAGzD,OAAO,EAAE,eAAe,EACvB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,EAE7C,4BAA4B,EAAE,6BAA6B,EAChC,iBAAiB,EAAE,iBAAiB;IAMxD,cAAc,aAQrB;cAEiB,eAAe,IAAI,qBAAqB;IAY3D,WAAW,EAAE,WAAW,CAkCtB;IAEF,eAAe,EAAE,eAAe,CAqB9B;IAEF,kBAAkB,EAAE,kBAAkB,CA8BpC;IAEa,GAAG;CA8EnB"}
+{"version":3,"file":"jupyter-code-cell-view.d.ts","sourceRoot":"","sources":["../../src/cell/jupyter-code-cell-view.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAkB,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,KAAK,EACV,qBAAqB,EACrB,kBAAkB,EAElB,eAAe,EAEhB,MAAM,4BAA4B,CAAC;AAWpC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAkBzE,qBAEa,mBAAoB,SAAQ,iBAAiB;IAChD,MAAM,EAAE,gBAAgB,CAAC;IACxB,IAAI,2FAA4B;IACjC,KAAK,EAAE,oBAAoB,CAAC;IAE3B,cAAc,aAQrB;cAEiB,eAAe,IAAI,qBAAqB;IAgB3D,eAAe,EAAE,eAAe,CAqB9B;IAEF,kBAAkB,EAAE,kBAAkB,CA8BpC;IAEa,GAAG;CA8EnB"}

package/es/cell/jupyter-code-cell-view.js

@@ -21,12 +21,10 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 import { CellEditorMemo, LibroCodeCellView } from '@difizen/libro-code-cell';
-import { CodeEditorManager } from '@difizen/libro-code-editor';
-import { CellService } from '@difizen/libro-core';
 import { KernelError } from '@difizen/libro-kernel';
-import { ILSPDocumentConnectionManager } from '@difizen/libro-lsp';
-import { inject, transient } from '@difizen/mana-app';
-import { view, ViewInstance, ViewManager, ViewOption } from '@difizen/mana-app';
+import { LibroCellURIScheme } from '@difizen/libro-language-client';
+import { transient, URI } from '@difizen/mana-app';
+import { view, ViewInstance } from '@difizen/mana-app';
 import { getOrigin, useInject } from '@difizen/mana-app';
 import { l10n } from '@difizen/mana-l10n';
 import { forwardRef } from 'react';
@@ -45,12 +43,14 @@ var JupyterCodeCellComponent = /*#__PURE__*/forwardRef(function JupyterCodeCellC
 export var JupyterCodeCellView = (_dec = transient(), _dec2 = view('jupyter-code-cell-view'), _dec(_class = _dec2(_class = /*#__PURE__*/function (_LibroCodeCellView) {
   _inherits(JupyterCodeCellView, _LibroCodeCellView);
   var _super = _createSuper(JupyterCodeCellView);
-  function JupyterCodeCellView(options, cellService, viewManager, lspDocumentConnectionManager, codeEditorManager) {
+  function JupyterCodeCellView() {
     var _this;
     _classCallCheck(this, JupyterCodeCellView);
-    _this = _super.call(this, options, cellService, viewManager, codeEditorManager);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _super.call.apply(_super, [this].concat(args));
     _this.view = JupyterCodeCellComponent;
-    _this.lspDocumentConnectionManager = void 0;
     _this.clearExecution = function () {
       _this.model.clearExecution();
       Promise.resolve().then(function () {
@@ -58,129 +58,83 @@ export var JupyterCodeCellView = (_dec = transient(), _dec2 = view('jupyter-code
         return;
       }).catch(console.error);
     };
-    _this.lspProvider = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var adapter, virtualEditor, virtualDocument, lspConnection;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return _this.lspDocumentConnectionManager.ready;
-          case 2:
-            adapter = _this.lspDocumentConnectionManager.adapters.get(_this.parent.model.id);
-            if (adapter) {
-              _context.next = 5;
-              break;
-            }
-            throw new Error('no adapter');
-          case 5:
-            _context.next = 7;
-            return adapter.ready;
-          case 7:
-            virtualEditor = adapter.getCellEditor(_assertThisInitialized(_this));
-            if (virtualEditor) {
-              _context.next = 10;
-              break;
-            }
-            throw new Error('no virtual editor');
-          case 10:
-            // Get the associated virtual document of the opened document
-            virtualDocument = adapter.virtualDocument;
-            if (virtualDocument) {
-              _context.next = 13;
-              break;
-            }
-            throw new Error('no virtualDocument');
-          case 13:
-            // Get the LSP connection of the virtual document.
-            lspConnection = _this.lspDocumentConnectionManager.connections.get(virtualDocument.uri);
-            return _context.abrupt("return", {
-              virtualDocument: virtualDocument,
-              lspConnection: lspConnection,
-              editor: virtualEditor
-            });
-          case 15:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
     _this.tooltipProvider = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(option) {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(option) {
         var cellContent, kernelConnection, reply, value;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
             case 0:
               cellContent = _this.model.value;
               kernelConnection = getOrigin(_this.parent.model.kernelConnection);
               if (kernelConnection) {
-                _context2.next = 5;
+                _context.next = 5;
                 break;
               }
               alert(l10n.t('Kernel Connection 还没有建立'));
-              return _context2.abrupt("return", null);
+              return _context.abrupt("return", null);
             case 5:
-              _context2.next = 7;
+              _context.next = 7;
               return kernelConnection.requestInspect({
                 code: cellContent,
                 cursor_pos: option.cursorPosition,
                 detail_level: 1
               });
             case 7:
-              reply = _context2.sent;
+              reply = _context.sent;
               value = reply.content;
               if (!(value.status !== 'ok' || !value.found)) {
-                _context2.next = 11;
+                _context.next = 11;
                 break;
               }
-              return _context2.abrupt("return", null);
+              return _context.abrupt("return", null);
             case 11:
-              return _context2.abrupt("return", value.data['text/plain']);
+              return _context.abrupt("return", value.data['text/plain']);
             case 12:
             case "end":
-              return _context2.stop();
+              return _context.stop();
           }
-        }, _callee2);
+        }, _callee);
       }));
       return function (_x) {
-        return _ref2.apply(this, arguments);
+        return _ref.apply(this, arguments);
       };
     }();
     _this.completionProvider = /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(option) {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(option) {
         var cellContent, kernelConnection, reply, value;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               cellContent = _this.model.source;
               kernelConnection = getOrigin(_this.parent.model.kernelConnection);
               if (kernelConnection) {
-                _context3.next = 5;
+                _context2.next = 5;
                 break;
               }
               alert(l10n.t('Kernel Connection 还没有建立'));
               throw new Error(l10n.t('Kernel Connection 还没有建立'));
             case 5:
-              _context3.next = 7;
+              _context2.next = 7;
               return kernelConnection.requestComplete({
                 code: cellContent,
                 cursor_pos: option.cursorPosition
               });
             case 7:
-              reply = _context3.sent;
+              reply = _context2.sent;
               value = reply.content;
               if (!(value.status === 'abort')) {
-                _context3.next = 11;
+                _context2.next = 11;
                 break;
               }
               throw new Error('abort');
             case 11:
               if (!(value.status === 'error')) {
-                _context3.next = 13;
+                _context2.next = 13;
                 break;
               }
               throw new Error(value.ename);
             case 13:
-              return _context3.abrupt("return", {
+              return _context2.abrupt("return", {
                 matches: value.matches,
                 cursor_start: value.cursor_start,
                 cursor_end: value.cursor_end,
@@ -188,51 +142,51 @@ export var JupyterCodeCellView = (_dec = transient(), _dec2 = view('jupyter-code
               });
             case 14:
             case "end":
-              return _context3.stop();
+              return _context2.stop();
           }
-        }, _callee3);
+        }, _callee2);
       }));
       return function (_x2) {
-        return _ref3.apply(this, arguments);
+        return _ref2.apply(this, arguments);
       };
     }();
-    _this.lspDocumentConnectionManager = lspDocumentConnectionManager;
     return _this;
   }
-  JupyterCodeCellView = inject(CodeEditorManager)(JupyterCodeCellView, undefined, 4) || JupyterCodeCellView;
-  JupyterCodeCellView = inject(ILSPDocumentConnectionManager)(JupyterCodeCellView, undefined, 3) || JupyterCodeCellView;
-  JupyterCodeCellView = inject(ViewManager)(JupyterCodeCellView, undefined, 2) || JupyterCodeCellView;
-  JupyterCodeCellView = inject(CellService)(JupyterCodeCellView, undefined, 1) || JupyterCodeCellView;
-  JupyterCodeCellView = inject(ViewOption)(JupyterCodeCellView, undefined, 0) || JupyterCodeCellView;
   _createClass(JupyterCodeCellView, [{
     key: "getEditorOption",
     value: function getEditorOption() {
       var options = _get(_getPrototypeOf(JupyterCodeCellView.prototype), "getEditorOption", this).call(this);
+      var uri = new URI(this.parent.model.filePath);
+      uri = URI.withScheme(uri, LibroCellURIScheme);
+      uri = URI.withQuery(uri, "cellid=".concat(this.model.id));
       return _objectSpread(_objectSpread({}, options), {}, {
+        uuid: uri.toString(),
         tooltipProvider: this.tooltipProvider,
-        completionProvider: this.completionProvider,
-        lspProvider: this.parent.model.lspEnabled ? this.lspProvider : undefined
+        completionProvider: this.completionProvider
+        // lspProvider: (this.parent.model as LibroJupyterModel).lspEnabled
+        //   ? this.lspProvider
+        //   : undefined,
       });
     }
   }, {
     key: "run",
     value: function () {
-      var _run = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      var _run = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
         var libroModel, kernelConnection, cellContent, cellModel, future, startTimeStr, msgPromise, endTimeStr;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               libroModel = this.parent.model;
               if (!(!libroModel || !(libroModel instanceof LibroJupyterModel) || !libroModel.kernelConnection || libroModel.kernelConnection.isDisposed)) {
-                _context4.next = 3;
+                _context3.next = 3;
                 break;
               }
-              return _context4.abrupt("return", false);
+              return _context3.abrupt("return", false);
             case 3:
               kernelConnection = getOrigin(libroModel.kernelConnection);
               cellContent = this.model.source;
               cellModel = this.model;
-              _context4.prev = 6;
+              _context3.prev = 6;
               // if (this.outputArea instanceof LibroOutputArea)
               //   this.outputArea.lastOutputContainerHeight =
               //     this.outputArea.container?.current?.clientHeight;
@@ -264,10 +218,10 @@ export var JupyterCodeCellView = (_dec = transient(), _dec2 = view('jupyter-code
               future.onReply = function (msg) {
                 cellModel.msgChangeEmitter.fire(msg);
               };
-              _context4.next = 15;
+              _context3.next = 15;
               return future.done;
             case 15:
-              msgPromise = _context4.sent;
+              msgPromise = _context3.sent;
               cellModel.executing = false;
               cellModel.kernelExecuting = false;
               startTimeStr = msgPromise.metadata['started'];
@@ -275,36 +229,36 @@ export var JupyterCodeCellView = (_dec = transient(), _dec2 = view('jupyter-code
               cellModel.metadata.execution['shell.execute_reply.started'] = startTimeStr;
               cellModel.metadata.execution['shell.execute_reply.end'] = endTimeStr;
               if (msgPromise) {
-                _context4.next = 24;
+                _context3.next = 24;
                 break;
               }
-              return _context4.abrupt("return", true);
+              return _context3.abrupt("return", true);
             case 24:
               if (!(msgPromise.content.status === 'ok')) {
-                _context4.next = 28;
+                _context3.next = 28;
                 break;
               }
-              return _context4.abrupt("return", true);
+              return _context3.abrupt("return", true);
             case 28:
               throw new KernelError(msgPromise.content);
             case 29:
-              _context4.next = 36;
+              _context3.next = 36;
               break;
             case 31:
-              _context4.prev = 31;
-              _context4.t0 = _context4["catch"](6);
-              if (!_context4.t0.message.startsWith('Canceled')) {
-                _context4.next = 35;
+              _context3.prev = 31;
+              _context3.t0 = _context3["catch"](6);
+              if (!_context3.t0.message.startsWith('Canceled')) {
+                _context3.next = 35;
                 break;
               }
-              return _context4.abrupt("return", false);
+              return _context3.abrupt("return", false);
             case 35:
-              throw _context4.t0;
+              throw _context3.t0;
             case 36:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
-        }, _callee4, this, [[6, 31]]);
+        }, _callee3, this, [[6, 31]]);
       }));
       function run() {
         return _run.apply(this, arguments);

package/es/components/cell-execution-tip.js

@@ -21,7 +21,7 @@ export function CellExecutionTip(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     setCurrentTime = _useState2[1];
   var observableCell = useObserve(cell);
-  if (!ExecutableCellView.is(cell)) {
+  if (!ExecutableCellView.is(observableCell)) {
     return null;
   }
   if (!ExecutableCellModel.is(observableCell.model)) {
@@ -30,7 +30,7 @@ export function CellExecutionTip(_ref) {
   var isHidden = observableCell.model.hasOutputHidden;
   var kernelExecuting = cell.model.kernelExecuting;
   var executionInfo = parseExecutionInfoFromModel(cell.model);
-  var output = cell.outputArea.outputs;
+  var output = observableCell.outputArea.outputs;
   var existOutput = output && output.length !== 0;
   var waitingExecute = isWaitingExecute(observableCell.model);
   if (!executionInfo) {

package/es/file/navigatable-view.js

@@ -152,7 +152,7 @@ export var LibroNavigatableView = (_dec = transient(), _dec2 = view(LibroNavigat
               return _context2.abrupt("return");
             case 5:
               this.libroView = libroView;
-              this.libroView.model.onContentChanged(function () {
+              this.libroView.model.onChanged(function () {
                 _this3.dirty = true;
                 _this3.dirtyEmitter.fire();
                 if (_this3.autoSave === 'on') {

package/es/libro-jupyter-view.d.ts

@@ -3,9 +3,11 @@ import { VirtualizedManagerHelper } from '@difizen/libro-core';
 import { CollapseServiceFactory, NotebookService } from '@difizen/libro-core';
 import { LibroView } from '@difizen/libro-core';
 import { URI } from '@difizen/mana-app';
+import type { LibroJupyterModel } from './libro-jupyter-model.js';
 export declare class LibroJupyterView extends LibroView {
     uri: URI;
+    model: LibroJupyterModel;
     constructor(options: NotebookOption, collapseServiceFactory: CollapseServiceFactory, notebookService: NotebookService, virtualizedManagerHelper: VirtualizedManagerHelper);
-    get options(): import("@difizen/libro-core").Options;
+    get options(): NotebookOption;
 }
 //# sourceMappingURL=libro-jupyter-view.d.ts.map

package/es/libro-jupyter-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"libro-jupyter-view.d.ts","sourceRoot":"","sources":["../src/libro-jupyter-view.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAyB,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,GAAG,EAAoB,MAAM,mBAAmB,CAAC;AAG1D,qBAEa,gBAAiB,SAAQ,SAAS;IAC7C,GAAG,EAAE,GAAG,CAAC;gBAEa,OAAO,EAAE,cAAc,EACX,sBAAsB,EAAE,sBAAsB,EACrD,eAAe,EAAE,eAAe,EAEzD,wBAAwB,EAAE,wBAAwB;IAOpD,IAAI,OAAO,0CAEV;CACF"}
+{"version":3,"file":"libro-jupyter-view.d.ts","sourceRoot":"","sources":["../src/libro-jupyter-view.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAyB,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,GAAG,EAAoB,MAAM,mBAAmB,CAAC;AAG1D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAElE,qBAEa,gBAAiB,SAAQ,SAAS;IAC7C,GAAG,EAAE,GAAG,CAAC;IACD,KAAK,EAAE,iBAAiB,CAAC;gBAEX,OAAO,EAAE,cAAc,EACX,sBAAsB,EAAE,sBAAsB,EACrD,eAAe,EAAE,eAAe,EAEzD,wBAAwB,EAAE,wBAAwB;IAOpD,IAAI,OAAO,mBAEV;CACF"}

package/es/module.js

@@ -3,7 +3,7 @@ import { CodeMirrorEditorModule } from '@difizen/libro-codemirror';
 import { LibroE2EditorModule } from '@difizen/libro-cofine-editor';
 import { CellExecutionTimeProvider, CellInputBottonBlankProvider, LibroAddCellModule, LibroKeybindRegistry, LibroModel, LibroModule, LibroToolbarModule } from '@difizen/libro-core';
 import { LibroKernelManageModule } from '@difizen/libro-kernel';
-import { LibroLSPModule } from '@difizen/libro-lsp';
+import { LibroLanguageClientModule } from '@difizen/libro-language-client';
 import { MarkdownCellModule } from '@difizen/libro-markdown-cell';
 import { DisplayDataOutputModule, ErrorOutputModule, StreamOutputModule } from '@difizen/libro-output';
 import { RawCellModule } from '@difizen/libro-raw-cell';
@@ -45,6 +45,6 @@ export var LibroJupyterModule = ManaModule.create().register(LibroJupyterFileSer
 }, {
   token: LibroCodeCellView,
   useClass: JupyterCodeCellView
-}).dependOn(LibroModule, CodeCellModule, MarkdownCellModule, RawCellModule, StreamOutputModule, ErrorOutputModule, DisplayDataOutputModule, LibroToolbarModule, LibroKernelManageModule, LibroSearchModule, SearchCodeCellModule, LibroAddCellModule, LibroLSPModule, LibroE2EditorModule, CodeMirrorEditorModule,
+}).dependOn(LibroModule, CodeCellModule, MarkdownCellModule, RawCellModule, StreamOutputModule, ErrorOutputModule, DisplayDataOutputModule, LibroToolbarModule, LibroKernelManageModule, LibroSearchModule, SearchCodeCellModule, LibroAddCellModule, LibroE2EditorModule, CodeMirrorEditorModule,
 // custom module
-LibroBetweenCellModule, KeybindInstructionsModule, PlotlyModule, LibroJupyterFileModule);
+LibroBetweenCellModule, KeybindInstructionsModule, PlotlyModule, LibroJupyterFileModule, LibroLanguageClientModule);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-jupyter",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "description": "",
   "keywords": [
     "libro"
@@ -31,21 +31,22 @@
     "src"
   ],
   "dependencies": {
-    "@difizen/libro-cofine-editor": "^0.1.18",
-    "@difizen/libro-code-editor": "^0.1.18",
-    "@difizen/libro-code-cell": "^0.1.18",
-    "@difizen/libro-codemirror": "^0.1.18",
-    "@difizen/libro-rendermime": "^0.1.18",
-    "@difizen/libro-common": "^0.1.18",
-    "@difizen/libro-core": "^0.1.18",
-    "@difizen/libro-kernel": "^0.1.18",
-    "@difizen/libro-l10n": "^0.1.18",
-    "@difizen/libro-output": "^0.1.18",
-    "@difizen/libro-search": "^0.1.18",
-    "@difizen/libro-search-code-cell": "^0.1.18",
-    "@difizen/libro-lsp": "^0.1.18",
-    "@difizen/libro-markdown-cell": "^0.1.18",
-    "@difizen/libro-raw-cell": "^0.1.18",
+    "@difizen/libro-cofine-editor": "^0.1.19",
+    "@difizen/libro-code-editor": "^0.1.19",
+    "@difizen/libro-code-cell": "^0.1.19",
+    "@difizen/libro-codemirror": "^0.1.19",
+    "@difizen/libro-rendermime": "^0.1.19",
+    "@difizen/libro-common": "^0.1.19",
+    "@difizen/libro-core": "^0.1.19",
+    "@difizen/libro-kernel": "^0.1.19",
+    "@difizen/libro-l10n": "^0.1.19",
+    "@difizen/libro-output": "^0.1.19",
+    "@difizen/libro-search": "^0.1.19",
+    "@difizen/libro-search-code-cell": "^0.1.19",
+    "@difizen/libro-lsp": "^0.1.19",
+    "@difizen/libro-markdown-cell": "^0.1.19",
+    "@difizen/libro-raw-cell": "^0.1.19",
+    "@difizen/libro-language-client": "^0.1.19",
     "@difizen/mana-app": "latest",
     "@difizen/mana-l10n": "latest",
     "@ant-design/colors": "^7.0.0",

package/src/cell/jupyter-code-cell-view.tsx

@@ -1,5 +1,4 @@
 import { CellEditorMemo, LibroCodeCellView } from '@difizen/libro-code-cell';
-import { CodeEditorManager } from '@difizen/libro-code-editor';
 import type {
   CodeEditorViewOptions,
   CompletionProvider,
@@ -7,19 +6,17 @@ import type {
   TooltipProvider,
   TooltipProviderOption,
 } from '@difizen/libro-code-editor';
-import type { CellViewOptions } from '@difizen/libro-core';
-import { CellService } from '@difizen/libro-core';
 import { KernelError } from '@difizen/libro-kernel';
-import type { LSPConnection, LSPProvider } from '@difizen/libro-lsp';
-import { ILSPDocumentConnectionManager } from '@difizen/libro-lsp';
-import { inject, transient } from '@difizen/mana-app';
-import { view, ViewInstance, ViewManager, ViewOption } from '@difizen/mana-app';
+import { LibroCellURIScheme } from '@difizen/libro-language-client';
+import { transient, URI } from '@difizen/mana-app';
+import { view, ViewInstance } from '@difizen/mana-app';
 import { getOrigin, useInject } from '@difizen/mana-app';
 import { l10n } from '@difizen/mana-l10n';
 import { forwardRef } from 'react';
 
 import { LibroJupyterModel } from '../libro-jupyter-model.js';
 import type { ExecutionMeta } from '../libro-jupyter-protocol.js';
+import type { LibroJupyterView } from '../libro-jupyter-view.js';
 
 import type { JupyterCodeCellModel } from './jupyter-code-cell-model.js';
 
@@ -42,23 +39,10 @@ const JupyterCodeCellComponent = forwardRef<HTMLDivElement>(
 @transient()
 @view('jupyter-code-cell-view')
 export class JupyterCodeCellView extends LibroCodeCellView {
+  declare parent: LibroJupyterView;
   override view = JupyterCodeCellComponent;
   declare model: JupyterCodeCellModel;
 
-  protected readonly lspDocumentConnectionManager: ILSPDocumentConnectionManager;
-
-  constructor(
-    @inject(ViewOption) options: CellViewOptions,
-    @inject(CellService) cellService: CellService,
-    @inject(ViewManager) viewManager: ViewManager,
-    @inject(ILSPDocumentConnectionManager)
-    lspDocumentConnectionManager: ILSPDocumentConnectionManager,
-    @inject(CodeEditorManager) codeEditorManager: CodeEditorManager,
-  ) {
-    super(options, cellService, viewManager, codeEditorManager);
-    this.lspDocumentConnectionManager = lspDocumentConnectionManager;
-  }
-
   override clearExecution = () => {
     this.model.clearExecution();
     Promise.resolve()
@@ -71,52 +55,20 @@ export class JupyterCodeCellView extends LibroCodeCellView {
 
   protected override getEditorOption(): CodeEditorViewOptions {
     const options = super.getEditorOption();
+    let uri = new URI(this.parent.model.filePath);
+    uri = URI.withScheme(uri, LibroCellURIScheme);
+    uri = URI.withQuery(uri, `cellid=${this.model.id}`);
     return {
       ...options,
+      uuid: uri.toString(),
       tooltipProvider: this.tooltipProvider,
       completionProvider: this.completionProvider,
-      lspProvider: (this.parent.model as LibroJupyterModel).lspEnabled
-        ? this.lspProvider
-        : undefined,
+      // lspProvider: (this.parent.model as LibroJupyterModel).lspEnabled
+      //   ? this.lspProvider
+      //   : undefined,
     };
   }
 
-  lspProvider: LSPProvider = async () => {
-    await this.lspDocumentConnectionManager.ready;
-    const adapter = this.lspDocumentConnectionManager.adapters.get(
-      this.parent.model.id,
-    );
-    if (!adapter) {
-      throw new Error('no adapter');
-    }
-
-    await adapter.ready;
-
-    const virtualEditor = adapter.getCellEditor(this);
-
-    if (!virtualEditor) {
-      throw new Error('no virtual editor');
-    }
-
-    // Get the associated virtual document of the opened document
-    const virtualDocument = adapter.virtualDocument;
-
-    if (!virtualDocument) {
-      throw new Error('no virtualDocument');
-    }
-
-    // Get the LSP connection of the virtual document.
-    const lspConnection = this.lspDocumentConnectionManager.connections.get(
-      virtualDocument.uri,
-    ) as LSPConnection;
-
-    return {
-      virtualDocument,
-      lspConnection,
-      editor: virtualEditor,
-    };
-  };
-
   tooltipProvider: TooltipProvider = async (option: TooltipProviderOption) => {
     const cellContent = this.model.value;
     const kernelConnection = getOrigin(

package/src/components/cell-execution-tip.tsx

@@ -25,7 +25,7 @@ export function CellExecutionTip({ cell }: { cell: CellView }) {
   const [, setCurrentTime] = useState<number>();
   const observableCell = useObserve(cell);
 
-  if (!ExecutableCellView.is(cell)) {
+  if (!ExecutableCellView.is(observableCell)) {
     return null;
   }
 
@@ -38,7 +38,7 @@ export function CellExecutionTip({ cell }: { cell: CellView }) {
     .kernelExecuting;
   const executionInfo = parseExecutionInfoFromModel(cell.model);
 
-  const output = cell.outputArea.outputs;
+  const output = observableCell.outputArea.outputs;
   const existOutput = output && output.length !== 0;
 
   const waitingExecute = isWaitingExecute(observableCell.model);

package/src/file/navigatable-view.tsx

@@ -141,7 +141,7 @@ export class LibroNavigatableView
       return;
     }
     this.libroView = libroView;
-    this.libroView.model.onContentChanged(() => {
+    this.libroView.model.onChanged(() => {
       this.dirty = true;
       this.dirtyEmitter.fire();
       if (this.autoSave === 'on') {

package/src/libro-jupyter-view.tsx

@@ -5,10 +5,13 @@ import { LibroView, notebookViewFactoryId } from '@difizen/libro-core';
 import { URI, view, ViewOption } from '@difizen/mana-app';
 import { inject, transient } from '@difizen/mana-app';
 
+import type { LibroJupyterModel } from './libro-jupyter-model.js';
+
 @transient()
 @view(notebookViewFactoryId)
 export class LibroJupyterView extends LibroView {
   uri: URI;
+  declare model: LibroJupyterModel;
   constructor(
     @inject(ViewOption) options: NotebookOption,
     @inject(CollapseServiceFactory) collapseServiceFactory: CollapseServiceFactory,

package/src/module.ts

@@ -15,7 +15,7 @@ import {
   LibroToolbarModule,
 } from '@difizen/libro-core';
 import { LibroKernelManageModule } from '@difizen/libro-kernel';
-import { LibroLSPModule } from '@difizen/libro-lsp';
+import { LibroLanguageClientModule } from '@difizen/libro-language-client';
 import { MarkdownCellModule } from '@difizen/libro-markdown-cell';
 import {
   DisplayDataOutputModule,
@@ -102,7 +102,6 @@ export const LibroJupyterModule = ManaModule.create()
     LibroSearchModule,
     SearchCodeCellModule,
     LibroAddCellModule,
-    LibroLSPModule,
     LibroE2EditorModule,
     CodeMirrorEditorModule,
     // custom module
@@ -110,4 +109,5 @@ export const LibroJupyterModule = ManaModule.create()
     KeybindInstructionsModule,
     PlotlyModule,
     LibroJupyterFileModule,
+    LibroLanguageClientModule,
   );