@difizen/libro-jupyter 0.1.1 → 0.1.3

package/es/add-between-cell/add-between-cell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-between-cell.d.ts","sourceRoot":"","sources":["../../src/add-between-cell/add-between-cell.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAa,MAAM,qBAAqB,CAAC;AAU1E,OAAO,cAAc,CAAC;AA0BtB,eAAO,MAAM,6BAA6B,EAAE,mBAwJ3C,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,mBAS5C,CAAC"}
+{"version":3,"file":"add-between-cell.d.ts","sourceRoot":"","sources":["../../src/add-between-cell/add-between-cell.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAA0B,MAAM,qBAAqB,CAAC;AAUvF,OAAO,cAAc,CAAC;AA0BtB,eAAO,MAAM,6BAA6B,EAAE,mBA+J3C,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,mBAW5C,CAAC"}

package/es/add-between-cell/add-between-cell.js

@@ -51,8 +51,7 @@ var AddCellOutlined = function AddCellOutlined() {
 };
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-export var LibroCommonBetweenCellContent = /*#__PURE__*/forwardRef(function LibroCommonBetweenCellContent(props, _ref) {
-  // eslint-disable-next-line react/prop-types
+export var LibroCommonBetweenCellContent = /*#__PURE__*/forwardRef(function LibroCommonBetweenCellContent(props, ref) {
   var addCell = props.addCell,
     index = props.index;
   var _useInject = useInject(CellService),
@@ -91,7 +90,7 @@ export var LibroCommonBetweenCellContent = /*#__PURE__*/forwardRef(function Libr
   var clearDelay = function clearDelay() {
     clearTimeout(delayRef.current);
   };
-  var openTooltip = function openTooltip(_nextOpen) {
+  var openTooltip = function openTooltip(nextOpen) {
     var delay = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0.5;
     clearDelay();
     if (delay === 0) {
@@ -160,7 +159,7 @@ export var LibroCommonBetweenCellContent = /*#__PURE__*/forwardRef(function Libr
         tabIndex: 10,
         className: "libro-add-between-cell-anchor",
         style: {
-          position: 'fixed',
+          position: 'absolute',
           top: position.top + 5,
           left: position.left + 5,
           width: 1,
@@ -196,9 +195,11 @@ export var LibroCommonBetweenCellContent = /*#__PURE__*/forwardRef(function Libr
         closeTooltip();
         setGutterVisible(true);
         setMenuVisible(true);
+
+        // TODO: 位置不准确
         setPosition({
-          top: e.clientY,
-          left: e.clientX
+          top: e.nativeEvent.offsetY,
+          left: e.nativeEvent.offsetX
         });
         (_anchorRef$current4 = anchorRef.current) === null || _anchorRef$current4 === void 0 || _anchorRef$current4.focus();
       },
@@ -229,7 +230,6 @@ export var LibroCommonBetweenCellContent = /*#__PURE__*/forwardRef(function Libr
   });
 });
 export var LibroWrappedBetweenCellContent = function LibroWrappedBetweenCellContent(props) {
-  // eslint-disable-next-line react/prop-types
   var index = props.index,
     addCell = props.addCell;
   var instance = useInject(ViewInstance);

package/es/add-between-cell/index.less

@@ -101,3 +101,9 @@
   outline: none;
   cursor: pointer;
 }
+
+.ReactVirtualized__List {
+  .libro-add-between-cell-area {
+    width: calc(100% - 45px);
+  }
+}

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

@@ -1,8 +1,8 @@
-import { LibroCodeCellModel } from '@difizen/libro-codemirror-code-cell';
+import { LibroCodeCellModel } from '@difizen/libro-code-cell';
 import type { ICellMetadata } from '@difizen/libro-common';
 import { CellOptions } from '@difizen/libro-core';
 import { ViewManager } from '@difizen/mana-app';
-import type { ExecutedWithKernelCellModel, CodeCellMetadata } from '../libro-jupyter-protocol.js';
+import type { CodeCellMetadata, ExecutedWithKernelCellModel } from '../libro-jupyter-protocol.js';
 export declare class JupyterCodeCellModel extends LibroCodeCellModel implements ExecutedWithKernelCellModel {
     metadata: Partial<CodeCellMetadata | ICellMetadata>;
     kernelExecuting: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"jupyter-code-cell-model.d.ts","sourceRoot":"","sources":["../../src/cell/jupyter-code-cell-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAAQ,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,KAAK,EACV,2BAA2B,EAC3B,gBAAgB,EACjB,MAAM,8BAA8B,CAAC;AAEtC,qBACa,oBACX,SAAQ,kBACR,YAAW,2BAA2B;IAG7B,QAAQ,EAAE,OAAO,CAAC,gBAAgB,GAAG,aAAa,CAAC,CAAC;IAE7D,eAAe,UAAS;gBAGD,OAAO,EAAE,WAAW,EACpB,WAAW,EAAE,WAAW;IAMtC,cAAc,aAKrB;CACH"}
+{"version":3,"file":"jupyter-code-cell-model.d.ts","sourceRoot":"","sources":["../../src/cell/jupyter-code-cell-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAAQ,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,KAAK,EACV,gBAAgB,EAChB,2BAA2B,EAC5B,MAAM,8BAA8B,CAAC;AAEtC,qBACa,oBACX,SAAQ,kBACR,YAAW,2BAA2B;IAG7B,QAAQ,EAAE,OAAO,CAAC,gBAAgB,GAAG,aAAa,CAAC,CAAC;IAE7D,eAAe,UAAS;gBAGD,OAAO,EAAE,WAAW,EACpB,WAAW,EAAE,WAAW;IAStC,cAAc,aAIrB;CACH"}

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

@@ -1,5 +1,8 @@
 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;
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 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 _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; }
@@ -15,7 +18,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 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 { LibroCodeCellModel } from '@difizen/libro-codemirror-code-cell';
+import { LibroCodeCellModel } from '@difizen/libro-code-cell';
 import { CellOptions } from '@difizen/libro-core';
 import { inject, transient } from '@difizen/mana-app';
 import { prop, ViewManager } from '@difizen/mana-app';
@@ -31,11 +34,12 @@ export var JupyterCodeCellModel = (_dec = transient(), _dec2 = prop(), _dec3 = p
     _initializerDefineProperty(_this, "kernelExecuting", _descriptor2, _assertThisInitialized(_this));
     _this.clearExecution = function () {
       _this.executeCount = null;
-      _this.executing = false;
       _this.kernelExecuting = false;
       _this.metadata.execution = {};
     };
-    _this.metadata = ((_options$cell = options.cell) === null || _options$cell === void 0 ? void 0 : _options$cell.metadata) || {};
+    _this.metadata = _objectSpread(_objectSpread({}, options === null || options === void 0 || (_options$cell = options.cell) === null || _options$cell === void 0 ? void 0 : _options$cell.metadata), {}, {
+      libroFormatter: _this.libroFormatType
+    });
     return _this;
   }
   JupyterCodeCellModel = inject(ViewManager)(JupyterCodeCellModel, undefined, 1) || JupyterCodeCellModel;

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

@@ -1,16 +1,21 @@
 /// <reference types="react" resolution-mode="require"/>
-import type { CompletionProvider, TooltipProvider } from '@difizen/libro-code-editor';
-import { LibroCodeCellView } from '@difizen/libro-codemirror-code-cell';
+import { LibroCodeCellView } from '@difizen/libro-code-cell';
+import { CodeEditorManager, CodeEditorSettings } 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 { JupyterCodeCellModel } from './jupyter-code-cell-model.js';
 export declare class JupyterCodeCellView extends LibroCodeCellView {
     view: import("react").ForwardRefExoticComponent<import("react").RefAttributes<HTMLDivElement>>;
     model: JupyterCodeCellModel;
-    constructor(options: CellViewOptions, cellService: CellService, viewManager: ViewManager);
+    protected readonly lspDocumentConnectionManager: ILSPDocumentConnectionManager;
+    constructor(options: CellViewOptions, cellService: CellService, viewManager: ViewManager, lspDocumentConnectionManager: ILSPDocumentConnectionManager, codeEditorManager: CodeEditorManager, codeEditorSettings: CodeEditorSettings);
     clearExecution: () => void;
-    onViewMount(): 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":";AACA,OAAO,KAAK,EAEV,kBAAkB,EAElB,eAAe,EAEhB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAkB,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGlD,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;gBAGd,OAAO,EAAE,eAAe,EACvB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW;IAKtC,cAAc,aAGrB;IAEO,WAAW;IAgCpB,eAAe,EAAE,eAAe,CAqB9B;IAEF,kBAAkB,EAAE,kBAAkB,CA8BpC;IAEa,GAAG;CA0EnB"}
+{"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,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACnF,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,EACnC,kBAAkB,EAAE,kBAAkB;IAM3D,cAAc,aAQrB;cAEiB,eAAe,IAAI,qBAAqB;IAY3D,WAAW,EAAE,WAAW,CAkCtB;IAEF,eAAe,EAAE,eAAe,CAqB9B;IAEF,kBAAkB,EAAE,kBAAkB,CA8BpC;IAEa,GAAG;CA8EnB"}

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

@@ -11,6 +11,8 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 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(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _get() { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get.bind(); } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(arguments.length < 3 ? target : receiver); } return desc.value; }; } return _get.apply(this, arguments); }
+function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
@@ -18,19 +20,19 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 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 { CodeEditorView } from '@difizen/libro-code-editor';
-import { codeMirrorEditorFactory } from '@difizen/libro-codemirror';
-import { CellEditorMemo, LibroCodeCellView } from '@difizen/libro-codemirror-code-cell';
+import { CellEditorMemo, LibroCodeCellView } from '@difizen/libro-code-cell';
+import { CodeEditorManager, CodeEditorSettings } 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 { getOrigin, useInject, watch } 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 { jsx as _jsx } from "react/jsx-runtime";
-var JupyterCodeCellComponent = /*#__PURE__*/forwardRef(function JupyterCodeCellComponent(_props, ref) {
+var JupyterCodeCellComponent = /*#__PURE__*/forwardRef(function JupyterCodeCellComponent(props, ref) {
   var instance = useInject(ViewInstance);
   return /*#__PURE__*/_jsx("div", {
     className: instance.className,
@@ -43,92 +45,142 @@ 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) {
+  function JupyterCodeCellView(options, cellService, viewManager, lspDocumentConnectionManager, codeEditorManager, codeEditorSettings) {
     var _this;
     _classCallCheck(this, JupyterCodeCellView);
-    _this = _super.call(this, options, cellService, viewManager);
+    _this = _super.call(this, options, cellService, viewManager, codeEditorManager, codeEditorSettings);
     _this.view = JupyterCodeCellComponent;
+    _this.lspDocumentConnectionManager = void 0;
     _this.clearExecution = function () {
       _this.model.clearExecution();
-      _this.outputArea.clear();
+      Promise.resolve().then(function () {
+        _this.outputArea.clear();
+        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 _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(option) {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(option) {
         var cellContent, kernelConnection, reply, value;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               cellContent = _this.model.value;
               kernelConnection = getOrigin(_this.parent.model.kernelConnection);
               if (kernelConnection) {
-                _context.next = 5;
+                _context2.next = 5;
                 break;
               }
               alert(l10n.t('Kernel Connection 还没有建立'));
-              return _context.abrupt("return", null);
+              return _context2.abrupt("return", null);
             case 5:
-              _context.next = 7;
+              _context2.next = 7;
               return kernelConnection.requestInspect({
                 code: cellContent,
                 cursor_pos: option.cursorPosition,
                 detail_level: 1
               });
             case 7:
-              reply = _context.sent;
+              reply = _context2.sent;
               value = reply.content;
               if (!(value.status !== 'ok' || !value.found)) {
-                _context.next = 11;
+                _context2.next = 11;
                 break;
               }
-              return _context.abrupt("return", null);
+              return _context2.abrupt("return", null);
             case 11:
-              return _context.abrupt("return", value.data['text/plain']);
+              return _context2.abrupt("return", value.data['text/plain']);
             case 12:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee);
+        }, _callee2);
       }));
       return function (_x) {
-        return _ref.apply(this, arguments);
+        return _ref2.apply(this, arguments);
       };
     }();
     _this.completionProvider = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(option) {
+      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(option) {
         var cellContent, kernelConnection, reply, value;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              cellContent = _this.model.value;
+              cellContent = _this.model.source;
               kernelConnection = getOrigin(_this.parent.model.kernelConnection);
               if (kernelConnection) {
-                _context2.next = 5;
+                _context3.next = 5;
                 break;
               }
               alert(l10n.t('Kernel Connection 还没有建立'));
               throw new Error(l10n.t('Kernel Connection 还没有建立'));
             case 5:
-              _context2.next = 7;
+              _context3.next = 7;
               return kernelConnection.requestComplete({
                 code: cellContent,
                 cursor_pos: option.cursorPosition
               });
             case 7:
-              reply = _context2.sent;
+              reply = _context3.sent;
               value = reply.content;
               if (!(value.status === 'abort')) {
-                _context2.next = 11;
+                _context3.next = 11;
                 break;
               }
               throw new Error('abort');
             case 11:
               if (!(value.status === 'error')) {
-                _context2.next = 13;
+                _context3.next = 13;
                 break;
               }
               throw new Error(value.ename);
             case 13:
-              return _context2.abrupt("return", {
+              return _context3.abrupt("return", {
                 matches: value.matches,
                 cursor_start: value.cursor_start,
                 cursor_end: value.cursor_end,
@@ -136,139 +188,124 @@ export var JupyterCodeCellView = (_dec = transient(), _dec2 = view('jupyter-code
               });
             case 14:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2);
+        }, _callee3);
       }));
       return function (_x2) {
-        return _ref2.apply(this, arguments);
+        return _ref3.apply(this, arguments);
       };
     }();
+    _this.lspDocumentConnectionManager = lspDocumentConnectionManager;
     return _this;
   }
+  JupyterCodeCellView = inject(CodeEditorSettings)(JupyterCodeCellView, undefined, 5) || JupyterCodeCellView;
+  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: "onViewMount",
-    value: function onViewMount() {
-      var _this2 = this;
-      var option = _objectSpread(_objectSpread({}, this.options), {}, {
-        factory: function factory(editorOption) {
-          return codeMirrorEditorFactory(_objectSpread(_objectSpread({}, editorOption), {}, {
-            config: _objectSpread(_objectSpread({}, editorOption.config), {
-              readOnly: _this2.parent.model.readOnly
-            })
-          }));
-        },
-        model: this.model,
+    key: "getEditorOption",
+    value: function getEditorOption() {
+      var options = _get(_getPrototypeOf(JupyterCodeCellView.prototype), "getEditorOption", this).call(this);
+      return _objectSpread(_objectSpread({}, options), {}, {
         tooltipProvider: this.tooltipProvider,
         completionProvider: this.completionProvider,
-        lspProvider: undefined
-      });
-      this.viewManager.getOrCreateView(CodeEditorView, option).then(function (editorView) {
-        _this2.editorView = editorView;
-        _this2.editorViewReadyDeferred.resolve();
-        watch(_this2.parent.model, 'readOnly', function () {
-          var _this2$editorView;
-          (_this2$editorView = _this2.editorView) === null || _this2$editorView === void 0 || (_this2$editorView = _this2$editorView.editor) === null || _this2$editorView === void 0 || _this2$editorView.setOption('readOnly', _this2.parent.model.readOnly);
-        });
-        _this2.editorView.onModalChange(function (val) {
-          return _this2.hasModal = val;
-        });
-        return;
-      }).catch(function () {
-        //
+        lspProvider: this.parent.model.lspEnabled ? this.lspProvider : undefined
       });
     }
   }, {
     key: "run",
     value: function () {
-      var _run = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      var _run = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
         var libroModel, kernelConnection, cellContent, cellModel, future, startTimeStr, msgPromise, endTimeStr;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               libroModel = this.parent.model;
               if (!(!libroModel || !(libroModel instanceof LibroJupyterModel) || !libroModel.kernelConnection || libroModel.kernelConnection.isDisposed)) {
-                _context3.next = 3;
+                _context4.next = 3;
                 break;
               }
-              return _context3.abrupt("return", false);
+              return _context4.abrupt("return", false);
             case 3:
               kernelConnection = getOrigin(libroModel.kernelConnection);
-              cellContent = this.model.value;
+              cellContent = this.model.source;
               cellModel = this.model;
-              _context3.prev = 6;
-              this.clearExecution();
+              _context4.prev = 6;
+              // if (this.outputArea instanceof LibroOutputArea)
+              //   this.outputArea.lastOutputContainerHeight =
+              //     this.outputArea.container?.current?.clientHeight;
+              cellModel.executing = true;
               future = kernelConnection.requestExecute({
                 code: cellContent
               });
               startTimeStr = '';
-              cellModel.executing = true;
-              cellModel.metadata['execution'] = {
-                'shell.execute_reply.started': '',
-                'shell.execute_reply.end': '',
-                to_execute: new Date().toISOString()
-              };
+              this.clearExecution();
 
               // Handle iopub messages
               future.onIOPub = function (msg) {
-                cellModel.msgChangeEmitter.fire(msg);
                 if (msg.header.msg_type === 'execute_input') {
+                  cellModel.metadata.execution = {
+                    'shell.execute_reply.started': '',
+                    'shell.execute_reply.end': '',
+                    to_execute: new Date().toISOString()
+                  };
                   cellModel.kernelExecuting = true;
                   startTimeStr = msg.header.date;
-                  var meta = cellModel.metadata['execution'];
+                  var meta = cellModel.metadata.execution;
                   if (meta) {
                     meta['shell.execute_reply.started'] = startTimeStr;
                   }
                 }
+                cellModel.msgChangeEmitter.fire(msg);
               };
               // Handle the execute reply.
               future.onReply = function (msg) {
                 cellModel.msgChangeEmitter.fire(msg);
               };
-              _context3.next = 16;
+              _context4.next = 15;
               return future.done;
-            case 16:
-              msgPromise = _context3.sent;
+            case 15:
+              msgPromise = _context4.sent;
               cellModel.executing = false;
               cellModel.kernelExecuting = false;
               startTimeStr = msgPromise.metadata['started'];
               endTimeStr = msgPromise.header.date;
-              cellModel.metadata['execution']['shell.execute_reply.started'] = startTimeStr;
-              cellModel.metadata['execution']['shell.execute_reply.end'] = endTimeStr;
+              cellModel.metadata.execution['shell.execute_reply.started'] = startTimeStr;
+              cellModel.metadata.execution['shell.execute_reply.end'] = endTimeStr;
               if (msgPromise) {
-                _context3.next = 25;
+                _context4.next = 24;
                 break;
               }
-              return _context3.abrupt("return", true);
-            case 25:
+              return _context4.abrupt("return", true);
+            case 24:
               if (!(msgPromise.content.status === 'ok')) {
-                _context3.next = 29;
+                _context4.next = 28;
                 break;
               }
-              return _context3.abrupt("return", true);
-            case 29:
+              return _context4.abrupt("return", true);
+            case 28:
               throw new KernelError(msgPromise.content);
-            case 30:
-              _context3.next = 37;
+            case 29:
+              _context4.next = 36;
               break;
-            case 32:
-              _context3.prev = 32;
-              _context3.t0 = _context3["catch"](6);
-              if (!_context3.t0.message.startsWith('Canceled')) {
-                _context3.next = 36;
+            case 31:
+              _context4.prev = 31;
+              _context4.t0 = _context4["catch"](6);
+              if (!_context4.t0.message.startsWith('Canceled')) {
+                _context4.next = 35;
                 break;
               }
-              return _context3.abrupt("return", false);
+              return _context4.abrupt("return", false);
+            case 35:
+              throw _context4.t0;
             case 36:
-              throw _context3.t0;
-            case 37:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this, [[6, 32]]);
+        }, _callee4, this, [[6, 31]]);
       }));
       function run() {
         return _run.apply(this, arguments);

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

@@ -1 +1 @@
-{"version":3,"file":"command-contribution.d.ts","sourceRoot":"","sources":["../../src/command/command-contribution.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,oBAAoB,EACpB,YAAY,EAMb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EACL,mBAAmB,EAEnB,YAAY,EAEb,MAAM,mBAAmB,CAAC;AAK3B,qBACa,+BAAgC,YAAW,mBAAmB;IACnD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACtC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAC;IAC9D,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAEpE,gBAAgB,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;CAuIjD"}
+{"version":3,"file":"command-contribution.d.ts","sourceRoot":"","sources":["../../src/command/command-contribution.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,oBAAoB,EACpB,YAAY,EAMb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EACL,mBAAmB,EAEnB,YAAY,EAEb,MAAM,mBAAmB,CAAC;AAK3B,qBACa,+BAAgC,YAAW,mBAAmB;IACnD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACtC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAC;IAC9D,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAEpE,gBAAgB,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;CA2IjD"}

package/es/command/command-contribution.js

@@ -29,7 +29,7 @@ export var LibroJupyterCommandContribution = (_dec = singleton({
     value: function registerCommands(command) {
       this.libroCommand.registerLibroCommand(command, KernelCommands['ShowKernelStatusAndSelector'], {
         execute: function () {
-          var _execute = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_cell, libro) {
+          var _execute = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(cell, libro) {
             return _regeneratorRuntime().wrap(function _callee$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
@@ -49,13 +49,13 @@ export var LibroJupyterCommandContribution = (_dec = singleton({
           }
           return execute;
         }(),
-        isVisible: function isVisible(_cell, libro, path) {
+        isVisible: function isVisible(cell, libro, path) {
           if (!libro || !(libro instanceof LibroView)) {
             return false;
           }
           return !(libro !== null && libro !== void 0 && libro.model.quickEditMode) && !(libro !== null && libro !== void 0 && libro.model.readOnly) && path === LibroToolbarArea.HeaderLeft;
         },
-        isEnabled: function isEnabled(_cell, libro) {
+        isEnabled: function isEnabled(cell, libro) {
           if (!libro || !(libro instanceof LibroView)) {
             return false;
           }
@@ -75,7 +75,7 @@ export var LibroJupyterCommandContribution = (_dec = singleton({
           }
           return !!cell;
         },
-        isEnabled: function isEnabled(_cell, libro) {
+        isEnabled: function isEnabled(cell, libro) {
           if (!libro || !(libro instanceof LibroView)) {
             return false;
           }
@@ -92,7 +92,7 @@ export var LibroJupyterCommandContribution = (_dec = singleton({
           }
           return !(libro !== null && libro !== void 0 && libro.model.quickEditMode) && !(libro !== null && libro !== void 0 && libro.model.readOnly) && path === LibroToolbarArea.CellRight;
         },
-        isEnabled: function isEnabled(_cell, libro) {
+        isEnabled: function isEnabled(cell, libro) {
           if (!libro || !(libro instanceof LibroView)) {
             return false;
           }
@@ -101,7 +101,7 @@ export var LibroJupyterCommandContribution = (_dec = singleton({
       });
       this.libroCommand.registerLibroCommand(command, NotebookCommands['SelectLastRunCell'], {
         execute: function () {
-          var _execute2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_cell, libro) {
+          var _execute2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(cell, libro) {
             return _regeneratorRuntime().wrap(function _callee2$(_context2) {
               while (1) switch (_context2.prev = _context2.next) {
                 case 0:
@@ -125,13 +125,13 @@ export var LibroJupyterCommandContribution = (_dec = singleton({
           }
           return execute;
         }(),
-        isVisible: function isVisible(_cell, libro, path) {
+        isVisible: function isVisible(cell, libro, path) {
           if (!libro || !(libro instanceof LibroView)) {
             return false;
           }
-          return path === LibroToolbarArea.HeaderCenter && !libro.model.readOnly;
+          return !(libro !== null && libro !== void 0 && libro.model.quickEditMode) && path === LibroToolbarArea.HeaderCenter && !libro.model.readOnly;
         },
-        isEnabled: function isEnabled(_cell, libro) {
+        isEnabled: function isEnabled(cell, libro) {
           if (!libro || !(libro instanceof LibroView) || libro.model.readOnly) {
             return false;
           }

package/es/components/cell-execution-tip.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cell-execution-tip.d.ts","sourceRoot":"","sources":["../../src/components/cell-execution-tip.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAmBpD,OAAO,cAAc,CAAC;AAEtB,wBAAgB,gBAAgB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,kDAoF5D"}
+{"version":3,"file":"cell-execution-tip.d.ts","sourceRoot":"","sources":["../../src/components/cell-execution-tip.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAoBpD,OAAO,cAAc,CAAC;AAEtB,wBAAgB,gBAAgB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,kDAyF5D"}