@difizen/libro-jupyter 0.1.1 → 0.1.2

package/package.json

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

package/src/add-between-cell/add-between-cell.tsx

@@ -1,5 +1,5 @@
 import { DisplayWrapComponent } from '@difizen/libro-common';
-import type { BetweenCellProvider, LibroView } from '@difizen/libro-core';
+import type { BetweenCellProvider, CellOptions, LibroView } from '@difizen/libro-core';
 import { CellService } from '@difizen/libro-core';
 import { CommandRegistry, useInject, ViewInstance } from '@difizen/mana-app';
 import { l10n } from '@difizen/mana-l10n';
@@ -36,8 +36,13 @@ const AddCellOutlined: React.FC = () => (
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export const LibroCommonBetweenCellContent: BetweenCellProvider = forwardRef(
-  function LibroCommonBetweenCellContent(props, _ref) {
-    // eslint-disable-next-line react/prop-types
+  function LibroCommonBetweenCellContent(
+    props: {
+      index: number;
+      addCell: (option: CellOptions, position?: number | undefined) => Promise<void>;
+    },
+    ref,
+  ) {
     const { addCell, index } = props;
     const { cellsMeta } = useInject<CellService>(CellService);
     const anchorRef = useRef<HTMLDivElement>(null);
@@ -62,7 +67,7 @@ export const LibroCommonBetweenCellContent: BetweenCellProvider = forwardRef(
       clearTimeout(delayRef.current);
     };
 
-    const openTooltip = (_nextOpen: boolean, delay = 0.5) => {
+    const openTooltip = (nextOpen: boolean, delay = 0.5) => {
       clearDelay();
 
       if (delay === 0) {
@@ -117,7 +122,7 @@ export const LibroCommonBetweenCellContent: BetweenCellProvider = forwardRef(
             tabIndex={10}
             className="libro-add-between-cell-anchor"
             style={{
-              position: 'fixed',
+              position: 'absolute',
               top: position.top + 5,
               left: position.left + 5,
               width: 1,
@@ -153,7 +158,9 @@ export const LibroCommonBetweenCellContent: BetweenCellProvider = forwardRef(
             closeTooltip();
             setGutterVisible(true);
             setMenuVisible(true);
-            setPosition({ top: e.clientY, left: e.clientX });
+
+            // TODO: 位置不准确
+            setPosition({ top: e.nativeEvent.offsetY, left: e.nativeEvent.offsetX });
             anchorRef.current?.focus();
           }}
         >
@@ -189,8 +196,10 @@ export const LibroCommonBetweenCellContent: BetweenCellProvider = forwardRef(
   },
 );
 
-export const LibroWrappedBetweenCellContent: BetweenCellProvider = (props) => {
-  // eslint-disable-next-line react/prop-types
+export const LibroWrappedBetweenCellContent: BetweenCellProvider = (props: {
+  index: number;
+  addCell: (option: CellOptions, position?: number | undefined) => Promise<void>;
+}) => {
   const { index, addCell } = props;
   const instance = useInject<LibroView>(ViewInstance);
   return (

package/src/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/src/cell/jupyter-code-cell-model.ts

@@ -1,12 +1,12 @@
-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 { inject, transient } from '@difizen/mana-app';
 import { prop, ViewManager } from '@difizen/mana-app';
 
 import type {
-  ExecutedWithKernelCellModel,
   CodeCellMetadata,
+  ExecutedWithKernelCellModel,
 } from '../libro-jupyter-protocol.js';
 
 @transient()
@@ -24,12 +24,14 @@ export class JupyterCodeCellModel
     @inject(ViewManager) viewManager: ViewManager,
   ) {
     super(options, viewManager);
-    this.metadata = options.cell?.metadata || {};
+    this.metadata = {
+      ...options?.cell?.metadata,
+      libroFormatter: this.libroFormatType,
+    };
   }
 
   override clearExecution = () => {
     this.executeCount = null;
-    this.executing = false;
     this.kernelExecuting = false;
     this.metadata.execution = {};
   };

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

@@ -1,4 +1,5 @@
-import { CodeEditorView } from '@difizen/libro-code-editor';
+import { CellEditorMemo, LibroCodeCellView } from '@difizen/libro-code-cell';
+import { CodeEditorManager, CodeEditorSettings } from '@difizen/libro-code-editor';
 import type {
   CodeEditorViewOptions,
   CompletionProvider,
@@ -6,14 +7,14 @@ import type {
   TooltipProvider,
   TooltipProviderOption,
 } from '@difizen/libro-code-editor';
-import { codeMirrorEditorFactory } from '@difizen/libro-codemirror';
-import { CellEditorMemo, LibroCodeCellView } from '@difizen/libro-codemirror-code-cell';
 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 { getOrigin, useInject, watch } from '@difizen/mana-app';
+import { getOrigin, useInject } from '@difizen/mana-app';
 import { l10n } from '@difizen/mana-l10n';
 import { forwardRef } from 'react';
 
@@ -23,7 +24,7 @@ import type { ExecutionMeta } from '../libro-jupyter-protocol.js';
 import type { JupyterCodeCellModel } from './jupyter-code-cell-model.js';
 
 const JupyterCodeCellComponent = forwardRef<HTMLDivElement>(
-  function JupyterCodeCellComponent(_props, ref) {
+  function JupyterCodeCellComponent(props, ref) {
     const instance = useInject<JupyterCodeCellView>(ViewInstance);
     return (
       <div
@@ -44,51 +45,79 @@ export class JupyterCodeCellView extends LibroCodeCellView {
   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,
+    @inject(CodeEditorSettings) codeEditorSettings: CodeEditorSettings,
   ) {
-    super(options, cellService, viewManager);
+    super(options, cellService, viewManager, codeEditorManager, codeEditorSettings);
+    this.lspDocumentConnectionManager = lspDocumentConnectionManager;
   }
 
   override clearExecution = () => {
     this.model.clearExecution();
-    this.outputArea.clear();
+    Promise.resolve()
+      .then(() => {
+        this.outputArea.clear();
+        return;
+      })
+      .catch(console.error);
   };
 
-  override onViewMount() {
-    const option: CodeEditorViewOptions = {
-      ...this.options,
-      factory: (editorOption) =>
-        codeMirrorEditorFactory({
-          ...editorOption,
-          config: {
-            ...editorOption.config,
-            ...{ readOnly: this.parent.model.readOnly },
-          },
-        }),
-      model: this.model,
+  protected override getEditorOption(): CodeEditorViewOptions {
+    const options = super.getEditorOption();
+    return {
+      ...options,
       tooltipProvider: this.tooltipProvider,
       completionProvider: this.completionProvider,
-      lspProvider: undefined,
+      lspProvider: (this.parent.model as LibroJupyterModel).lspEnabled
+        ? this.lspProvider
+        : undefined,
     };
-    this.viewManager
-      .getOrCreateView<CodeEditorView, CodeEditorViewOptions>(CodeEditorView, option)
-      .then((editorView) => {
-        this.editorView = editorView;
-        this.editorViewReadyDeferred.resolve();
-        watch(this.parent.model, 'readOnly', () => {
-          this.editorView?.editor?.setOption('readOnly', this.parent.model.readOnly);
-        });
-        this.editorView.onModalChange((val) => (this.hasModal = val));
-        return;
-      })
-      .catch(() => {
-        //
-      });
   }
 
+  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(
@@ -113,7 +142,7 @@ export class JupyterCodeCellView extends LibroCodeCellView {
   };
 
   completionProvider: CompletionProvider = async (option: CompletionProviderOption) => {
-    const cellContent = this.model.value;
+    const cellContent = this.model.source;
     const kernelConnection = getOrigin(
       (this.parent.model as LibroJupyterModel).kernelConnection,
     );
@@ -157,35 +186,37 @@ export class JupyterCodeCellView extends LibroCodeCellView {
     }
 
     const kernelConnection = getOrigin(libroModel.kernelConnection);
-    const cellContent = this.model.value;
+    const cellContent = this.model.source;
     const cellModel = this.model;
 
     try {
-      this.clearExecution();
+      // if (this.outputArea instanceof LibroOutputArea)
+      //   this.outputArea.lastOutputContainerHeight =
+      //     this.outputArea.container?.current?.clientHeight;
+      cellModel.executing = true;
       const future = kernelConnection.requestExecute({
         code: cellContent,
       });
 
       let startTimeStr = '';
-      cellModel.executing = true;
-
-      cellModel.metadata['execution'] = {
-        'shell.execute_reply.started': '',
-        'shell.execute_reply.end': '',
-        to_execute: new Date().toISOString(),
-      } as ExecutionMeta;
+      this.clearExecution();
 
       // Handle iopub messages
       future.onIOPub = (msg: any) => {
-        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(),
+          } as ExecutionMeta;
           cellModel.kernelExecuting = true;
           startTimeStr = msg.header.date as string;
-          const meta = cellModel.metadata['execution'] as ExecutionMeta;
+          const meta = cellModel.metadata.execution as ExecutionMeta;
           if (meta) {
             meta['shell.execute_reply.started'] = startTimeStr;
           }
         }
+        cellModel.msgChangeEmitter.fire(msg);
       };
       // Handle the execute reply.
       future.onReply = (msg: any) => {
@@ -199,8 +230,10 @@ export class JupyterCodeCellView extends LibroCodeCellView {
       startTimeStr = msgPromise.metadata['started'] as string;
       const endTimeStr = msgPromise.header.date;
 
-      cellModel.metadata['execution']['shell.execute_reply.started'] = startTimeStr;
-      cellModel.metadata['execution']['shell.execute_reply.end'] = endTimeStr;
+      (cellModel.metadata.execution as ExecutionMeta)['shell.execute_reply.started'] =
+        startTimeStr;
+      (cellModel.metadata.execution as ExecutionMeta)['shell.execute_reply.end'] =
+        endTimeStr;
 
       if (!msgPromise) {
         return true;

package/src/command/command-contribution.ts

@@ -30,12 +30,12 @@ export class LibroJupyterCommandContribution implements CommandContribution {
       command,
       KernelCommands['ShowKernelStatusAndSelector'],
       {
-        execute: async (_cell, libro) => {
+        execute: async (cell, libro) => {
           if (!libro || !(libro instanceof LibroView)) {
             return;
           }
         },
-        isVisible: (_cell, libro, path) => {
+        isVisible: (cell, libro, path) => {
           if (!libro || !(libro instanceof LibroView)) {
             return false;
           }
@@ -45,7 +45,7 @@ export class LibroJupyterCommandContribution implements CommandContribution {
             path === LibroToolbarArea.HeaderLeft
           );
         },
-        isEnabled: (_cell, libro) => {
+        isEnabled: (cell, libro) => {
           if (!libro || !(libro instanceof LibroView)) {
             return false;
           }
@@ -79,7 +79,7 @@ export class LibroJupyterCommandContribution implements CommandContribution {
           }
           return !!cell;
         },
-        isEnabled: (_cell, libro) => {
+        isEnabled: (cell, libro) => {
           if (!libro || !(libro instanceof LibroView)) {
             return false;
           }
@@ -113,7 +113,7 @@ export class LibroJupyterCommandContribution implements CommandContribution {
             path === LibroToolbarArea.CellRight
           );
         },
-        isEnabled: (_cell, libro) => {
+        isEnabled: (cell, libro) => {
           if (!libro || !(libro instanceof LibroView)) {
             return false;
           }
@@ -129,7 +129,7 @@ export class LibroJupyterCommandContribution implements CommandContribution {
       command,
       NotebookCommands['SelectLastRunCell'],
       {
-        execute: async (_cell, libro) => {
+        execute: async (cell, libro) => {
           if (!libro || !(libro instanceof LibroView)) {
             return;
           }
@@ -137,13 +137,17 @@ export class LibroJupyterCommandContribution implements CommandContribution {
             libro.model.findRunningCell();
           }
         },
-        isVisible: (_cell, libro, path) => {
+        isVisible: (cell, libro, path) => {
           if (!libro || !(libro instanceof LibroView)) {
             return false;
           }
-          return path === LibroToolbarArea.HeaderCenter && !libro.model.readOnly;
+          return (
+            !libro?.model.quickEditMode &&
+            path === LibroToolbarArea.HeaderCenter &&
+            !libro.model.readOnly
+          );
         },
-        isEnabled: (_cell, libro) => {
+        isEnabled: (cell, libro) => {
           if (!libro || !(libro instanceof LibroView) || libro.model.readOnly) {
             return false;
           }

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

@@ -8,6 +8,7 @@ import {
 import { useObserve } from '@difizen/mana-app';
 import classnames from 'classnames';
 import moment from 'moment';
+import { useState } from 'react';
 
 import type { JupyterCodeCellModel } from '../cell/jupyter-code-cell-model.js';
 import {
@@ -21,6 +22,7 @@ import { InfoCircle } from './icons.js';
 import './index.less';
 
 export function CellExecutionTip({ cell }: { cell: CellView }) {
+  const [, setCurrentTime] = useState<number>();
   const observableCell = useObserve(cell);
 
   if (!ExecutableCellView.is(cell)) {
@@ -32,7 +34,8 @@ export function CellExecutionTip({ cell }: { cell: CellView }) {
   }
 
   const isHidden = observableCell.model.hasOutputHidden;
-  const kernelExecuting = (cell.model as JupyterCodeCellModel).kernelExecuting;
+  const kernelExecuting = (cell.model as unknown as JupyterCodeCellModel)
+    .kernelExecuting;
   const executionInfo = parseExecutionInfoFromModel(cell.model);
 
   const output = cell.outputArea.outputs;
@@ -73,6 +76,9 @@ export function CellExecutionTip({ cell }: { cell: CellView }) {
       </div>
     );
   } else if (kernelExecuting) {
+    setTimeout(() => {
+      setCurrentTime(Date.now());
+    }, 100);
     return (
       <div
         className={classnames(
@@ -94,7 +100,7 @@ export function CellExecutionTip({ cell }: { cell: CellView }) {
       <div
         className={classnames(
           `libro-cell-execution-tip`,
-          waitingExecute && 'libro-cell-execution-tip-without-output',
+          !existOutput && 'libro-cell-execution-tip-without-output',
         )}
       >
         <div className="libro-cell-execution-tip-border" />

package/src/components/cell-input-bottom-blank.tsx

@@ -1,5 +1,5 @@
-import { LibroExecutableCellView } from '@difizen/libro-core';
 import type { CellView } from '@difizen/libro-core';
+import { LibroExecutableCellView, LibroOutputArea } from '@difizen/libro-core';
 import { useObserve } from '@difizen/mana-app';
 
 import { isWaitingExecute } from '../utils/index.js';
@@ -7,16 +7,21 @@ import { isWaitingExecute } from '../utils/index.js';
 export function CellInputBottomBlank({ cell }: { cell: CellView }) {
   const observableCell = useObserve(cell) as LibroExecutableCellView;
 
-  if (!(cell instanceof LibroExecutableCellView)) {
+  if (
+    !(cell instanceof LibroExecutableCellView) ||
+    !(observableCell.outputArea instanceof LibroOutputArea)
+  ) {
     return null;
   }
 
   const outputs = observableCell.outputArea.outputs;
-  const hasNoneOutput =
-    (!outputs || outputs.length === 0) && observableCell.model.executeCount;
+  const hasNoneOutput = !outputs || outputs.length === 0;
 
   // 有output时 或者 没有被执行过，不显示input底部的空白
-  if (hasNoneOutput || isWaitingExecute(observableCell.model)) {
+  if (
+    hasNoneOutput &&
+    (observableCell.model.executeCount || isWaitingExecute(observableCell.model))
+  ) {
     return <div className="libro-cell-bottom-blank" />;
   }
 

package/src/config/config-contribution.ts

@@ -3,12 +3,12 @@ import { ConfigurationContribution, ConfigurationService } from '@difizen/mana-a
 import { ApplicationContribution } from '@difizen/mana-app';
 import { inject, singleton } from '@difizen/mana-app';
 
-import { LibroAutosaveSetting } from './config.js';
+import { LibroJupyterConfiguration } from './config.js';
 
 @singleton({ contrib: ConfigurationContribution })
-export class LibroSettingContribution implements ConfigurationContribution {
+export class LibroJupyterSettingContribution implements ConfigurationContribution {
   registerConfigurations() {
-    return [LibroAutosaveSetting];
+    return [LibroJupyterConfiguration.AutoSave, LibroJupyterConfiguration.OpenSlot];
   }
 }
 @singleton({ contrib: ApplicationContribution })

package/src/config/config.ts

@@ -1,9 +1,8 @@
 import type { ConfigurationNode } from '@difizen/mana-app';
 import { l10n } from '@difizen/mana-l10n';
 
-export const LibroAutosaveSetting: ConfigurationNode<boolean> = {
+export const LibroConfigAutoSave: ConfigurationNode<boolean> = {
   id: 'libro.autosave',
-
   description: l10n.t('是否自动保存修改'),
   title: 'checkbox',
   type: 'checkbox',
@@ -12,3 +11,19 @@ export const LibroAutosaveSetting: ConfigurationNode<boolean> = {
     type: 'boolean',
   },
 };
+
+export const LibroConfigOpenSlot: ConfigurationNode<string> = {
+  id: 'libro.jupyter.open.slot',
+  description: '文件默认打开位置',
+  title: '文件默认打开位置',
+  type: 'checkbox',
+  defaultValue: 'main',
+  schema: {
+    type: 'string',
+  },
+};
+
+export const LibroJupyterConfiguration = {
+  AutoSave: LibroConfigAutoSave,
+  OpenSlot: LibroConfigOpenSlot,
+};

package/src/config/index.ts

@@ -1 +1,2 @@
 export * from './config-contribution.js';
+export * from './config.js';

package/src/file/file-command.tsx

@@ -11,7 +11,6 @@ import { ViewManager } from '@difizen/mana-app';
 import {
   CommandContribution,
   FileStatNode,
-  FileTreeCommand,
   inject,
   MenuContribution,
   ModalService,
@@ -71,6 +70,10 @@ const FileCommands = {
     id: 'fileTree.command.refresh',
     label: '刷新',
   },
+  REMOVE: {
+    id: 'fileTree.command.remove',
+    label: '删除',
+  },
 };
 export const FileTreeContextMenuPath: MenuPath = ['file-tree-context-menu'];
 
@@ -177,7 +180,7 @@ export class FileCommandContribution
         return FileStatNode.is(node) && node.fileStat.isFile;
       },
     });
-    command.registerHandler(FileTreeCommand.REMOVE.id, {
+    command.registerHandler(FileCommands.REMOVE.id, {
       execute: (node) => {
         if (FileStatNode.is(node)) {
           const filePath = node.uri.path.toString();