@opensumi/ide-notebook 3.4.5-next-1730119322.0

package/src/browser/kernel-panel/kernel.panel.color.tokens.ts

@@ -0,0 +1,39 @@
+import { localize } from '@opensumi/ide-core-browser';
+import { registerColor } from '@opensumi/ide-theme/lib/common';
+
+export const initKernelPanelColorToken = () => {
+  registerColor(
+    'kernel.panel.collapse.header.label',
+    { dark: '#ffffffd9', light: '#000a1ae3', hcDark: null, hcLight: null },
+    localize('kernel.panel.collapse.header.label', 'the collapse header label of kernel panel'),
+    true,
+  );
+
+  registerColor(
+    'kernel.panel.collapse.item',
+    { dark: '#ffffffa6', light: '#000a1ae3', hcDark: null, hcLight: null },
+    localize('kernel.panel.collapse.item', 'the collapse item color of kernel panel'),
+    true,
+  );
+
+  registerColor(
+    'kernel.panel.collapse.item.hover',
+    { dark: '#ffffff14', light: '#151b2114', hcDark: null, hcLight: null },
+    localize('kernel.panel.collapse.item.hover', 'the collapse item hover color of kernel panel'),
+    true,
+  );
+
+  registerColor(
+    'kernel.panel.collapse.header.close.all',
+    { dark: '#878c93', light: '#3c8dff', hcDark: null, hcLight: null },
+    localize('kernel.panel.collapse.header.close.all', 'the close all color of kernel panel'),
+    true,
+  );
+
+  registerColor(
+    'kernel.panel.collapse.header.close.hover',
+    { dark: '#253944', light: '#151b2114', hcDark: null, hcLight: null },
+    localize('kernel.panel.collapse.header.close.all', 'the close all color of kernel panel'),
+    true,
+  );
+};

package/src/browser/kernel-panel/kernel.panel.contribution.ts

@@ -0,0 +1,32 @@
+import { Autowired } from '@opensumi/di';
+import { ComponentContribution, ComponentRegistry, Domain } from '@opensumi/ide-core-browser';
+import { IconService } from '@opensumi/ide-theme/lib/browser';
+import { IconType } from '@opensumi/ide-theme/lib/common';
+
+import { KernelPanel } from './kernel-panel-view';
+import { KERNEL_PANEL_ID } from './kernel.panel.protocol';
+
+@Domain(ComponentContribution)
+export class KernelPanelContribution implements ComponentContribution {
+  @Autowired(IconService)
+  protected readonly iconService: IconService;
+
+  registerComponent(registry: ComponentRegistry) {
+    const iconClass = this.iconService.fromIcon(
+      '',
+      {
+        dark: 'https://mdn.alipayobjects.com/huamei_xt20ge/afts/img/A*ae86Sq9KTxcAAAAAAAAAAAAADiuUAQ/original',
+        light: 'https://mdn.alipayobjects.com/huamei_xt20ge/afts/img/A*fWPISIBPGfsAAAAAAAAAAAAADiuUAQ/original',
+      },
+      IconType.Background,
+    );
+    registry.register('@opensumi/ide-notebook', [], {
+      containerId: KERNEL_PANEL_ID,
+      iconClass,
+      title: '运行的终端和内核',
+      component: KernelPanel,
+      priority: 0,
+      activateKeyBinding: 'ctrlcmd+shift+k',
+    });
+  }
+}

package/src/browser/kernel-panel/kernel.panel.protocol.ts

@@ -0,0 +1,24 @@
+export const KERNEL_PANEL_ID = 'kernel-panel';
+
+export enum LibroPanelCollapseItemType {
+  PAGE = 'Page',
+  KERNEL = 'Kernel',
+}
+
+export interface LibroPanelCollapseItem {
+  id: string;
+  name: string;
+  shutdown?: () => Promise<void>;
+  restart?: () => Promise<void>;
+}
+
+export interface LibroPanelCollapseKernelItem extends LibroPanelCollapseItem {
+  notebooks: { sessionId: string; name: string; path: string }[];
+}
+
+export interface Props {
+  type: LibroPanelCollapseItemType;
+  items: LibroPanelCollapseItem[] | undefined;
+  refresh: () => void;
+  shutdownAll?: () => Promise<void>;
+}

package/src/browser/libro/editor/editor-contribution.ts

@@ -0,0 +1,41 @@
+import { CodeEditorContribution, CodeEditorFactory, LanguageSpecRegistry } from '@difizen/libro-code-editor';
+import { EditorStateFactory } from '@difizen/libro-jupyter/noeditor';
+import { inject, singleton } from '@difizen/mana-app';
+
+import { Injector } from '@opensumi/di';
+
+import { OpensumiInjector } from '../../mana';
+
+import {
+  LibroOpensumiEditorFactory,
+  OpensumiEditorState,
+  libroOpensumiEditorDefaultConfig,
+  stateFactory,
+} from './opensumi-editor';
+
+@singleton({ contrib: [CodeEditorContribution] })
+export class LibroE2EditorContribution implements CodeEditorContribution {
+  @inject(LanguageSpecRegistry)
+  protected readonly languageSpecRegistry: LanguageSpecRegistry;
+
+  factory: CodeEditorFactory;
+
+  stateFactory: EditorStateFactory<OpensumiEditorState>;
+
+  defaultConfig = libroOpensumiEditorDefaultConfig;
+
+  constructor(
+    @inject(LibroOpensumiEditorFactory)
+    libroOpensumiEditorFactory: LibroOpensumiEditorFactory,
+    @inject(OpensumiInjector) injector: Injector,
+  ) {
+    this.factory = libroOpensumiEditorFactory;
+    this.stateFactory = stateFactory(injector);
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  canHandle(mime: string): number {
+    // 代码编辑都使用opensumi编辑器
+    return 50 + 2;
+  }
+}

package/src/browser/libro/editor/index.less

@@ -0,0 +1,48 @@
+.libro-opensumi-editor-container {
+  padding: 12px 0 18px;
+  background: var(--mana-libro-input-background) !important;
+  border-radius: 4px;
+}
+
+.libro-opensumi-editor-container .libro-opensumi-editor .margin {
+  background-color: var(--mana-libro-input-background) !important;
+}
+
+.libro-opensumi-editor {
+  background: var(--mana-libro-input-background) !important;
+
+  .monaco-editor-background {
+    background-color: var(--mana-libro-input-background) !important;
+  }
+
+  .monaco-editor-background,
+  .margin {
+    background: var(--mana-libro-input-background) !important;
+  }
+
+  .findMatch {
+    background-color: var(--mana-libro-editor-search-match) !important;
+  }
+
+  .currentFindMatch {
+    background-color: var(--mana-libro-editor-search-currentmatch) !important;
+  }
+
+  .current-line-margin,
+  .current-line-both {
+    background: var(--mana-libro-editor-activeline-color) !important;
+    border: unset !important;
+  }
+
+  .line-numbers {
+    margin-left: 8px;
+    color: var(--mana-libro-editor-gutter-number-color) !important;
+    font-weight: 400;
+    font-size: 13px;
+    // font-family: Menlo-Regular, consolas, 'DejaVu Sans Mono', monospace !important;
+  }
+
+  .cursors-layer .cursor {
+    background-color: var(--mana-libro-editor-cursor-color);
+  }
+}

package/src/browser/libro/editor/keybind-handler.ts

@@ -0,0 +1,133 @@
+import { LibroSearchToggleCommand, LibroService, LibroView, NotebookCommands } from '@difizen/libro-jupyter/noeditor';
+import { ApplicationContribution, CommandRegistry, inject, singleton } from '@difizen/mana-app';
+
+import { Injector } from '@opensumi/di';
+import {
+  IContextKeyService,
+  KeybindingRegistry,
+  KeybindingScope,
+  CommandRegistry as SumiCommandRegistry,
+} from '@opensumi/ide-core-browser';
+import { WorkbenchEditorService } from '@opensumi/ide-editor';
+
+import { LIBRO_COMPONENTS_SCHEME_ID } from '../../libro.protocol';
+import { OpensumiInjector } from '../../mana/index';
+
+@singleton({ contrib: ApplicationContribution })
+export class Keybindhandler implements ApplicationContribution {
+  @inject(OpensumiInjector) injector: Injector;
+  @inject(CommandRegistry) protected readonly commandRegistry: CommandRegistry;
+  @inject(LibroService) protected readonly libroService: LibroService;
+
+  onStart() {
+    this.registerContextKey();
+    this.registerCommand();
+    this.registerKeybind();
+  }
+
+  registerContextKey() {
+    const contextKeyService: IContextKeyService = this.injector.get(IContextKeyService);
+    const workbenchEditorService: WorkbenchEditorService = this.injector.get(WorkbenchEditorService);
+    const notebookFocusContext = contextKeyService.createKey<boolean>('libroNotebookFocused', this.hasActiveNotebook());
+
+    workbenchEditorService.onActiveResourceChange((e) => {
+      if (e?.uri?.path.ext === `.${LIBRO_COMPONENTS_SCHEME_ID}`) {
+        notebookFocusContext.set(true);
+      } else {
+        notebookFocusContext.set(false);
+      }
+    });
+  }
+
+  hasActiveNotebook() {
+    return this.libroService.active instanceof LibroView;
+  }
+
+  registerCommand() {
+    const sumiCommandRegistry: SumiCommandRegistry = this.injector.get(SumiCommandRegistry);
+    sumiCommandRegistry.registerCommand(NotebookCommands['EnterCommandMode'], {
+      execute: () => {
+        this.commandRegistry.executeCommand(NotebookCommands['EnterCommandMode'].id);
+      },
+    });
+    sumiCommandRegistry.registerCommand(NotebookCommands['RunCell'], {
+      execute: () => {
+        this.commandRegistry.executeCommand(NotebookCommands['RunCell'].id);
+      },
+    });
+    sumiCommandRegistry.registerCommand(NotebookCommands['RunCellAndSelectNext'], {
+      execute: () => {
+        this.commandRegistry.executeCommand(NotebookCommands['RunCellAndSelectNext'].id);
+      },
+    });
+    sumiCommandRegistry.registerCommand(NotebookCommands['RunCellAndInsertBelow'], {
+      execute: () => {
+        this.commandRegistry.executeCommand(NotebookCommands['RunCellAndInsertBelow'].id);
+      },
+    });
+    sumiCommandRegistry.registerCommand(NotebookCommands['SplitCellAntCursor'], {
+      execute: () => {
+        this.commandRegistry.executeCommand(NotebookCommands['SplitCellAntCursor'].id);
+      },
+    });
+    sumiCommandRegistry.registerCommand(LibroSearchToggleCommand.ShowLibroSearch, {
+      execute: () => {
+        this.commandRegistry.executeCommand(LibroSearchToggleCommand.ShowLibroSearch.id);
+      },
+    });
+  }
+
+  registerKeybind() {
+    const keybindingService: KeybindingRegistry = this.injector.get(KeybindingRegistry);
+    keybindingService.registerKeybindings(
+      [
+        {
+          keybinding: 'f1',
+          command: '',
+          when: 'libroNotebookFocused',
+        },
+        {
+          keybinding: 'f8',
+          command: '',
+          when: 'libroNotebookFocused',
+        },
+        {
+          keybinding: 'f9',
+          command: '',
+          when: 'libroNotebookFocused',
+        },
+        {
+          keybinding: 'esc',
+          command: NotebookCommands['EnterCommandMode'].id,
+          when: 'libroNotebookFocused && !editorHasSelection && !editorHasSelection && !editorHasMultipleSelections',
+        },
+        {
+          keybinding: 'ctrlcmd+enter',
+          command: NotebookCommands['RunCell'].id,
+          when: 'libroNotebookFocused && !findWidgetVisible && !referenceSearchVisible',
+        },
+        {
+          keybinding: 'shift+enter',
+          command: NotebookCommands['RunCellAndSelectNext'].id,
+          when: 'libroNotebookFocused && !findInputFocussed',
+        },
+        {
+          keybinding: 'alt+enter',
+          command: NotebookCommands['RunCellAndInsertBelow'].id,
+          when: 'libroNotebookFocused && !findWidgetVisible',
+        },
+        {
+          keybinding: 'ctrlcmd+shift+-',
+          command: NotebookCommands['SplitCellAntCursor'].id,
+          when: 'libroNotebookFocused && !findWidgetVisible',
+        },
+        {
+          keybinding: 'ctrlcmd+f',
+          command: LibroSearchToggleCommand.ShowLibroSearch.id,
+          when: 'libroNotebookFocused',
+        },
+      ],
+      KeybindingScope.USER,
+    );
+  }
+}

package/src/browser/libro/editor/module.ts

@@ -0,0 +1,30 @@
+import { CodeEditorModule } from '@difizen/libro-code-editor';
+import { ManaModule } from '@difizen/mana-app';
+
+import { LibroE2EditorContribution } from './editor-contribution';
+import {
+  LibroOpensumiEditor,
+  LibroOpensumiEditorFactory,
+  LibroOpensumiEditorOptions,
+  LibroOpensumiEditorState,
+} from './opensumi-editor';
+
+import type { EditorState, IEditorOptions } from '@difizen/libro-code-editor';
+
+export const LibroOpensumiEditorModule = ManaModule.create()
+  .register(LibroE2EditorContribution, LibroOpensumiEditor, {
+    token: LibroOpensumiEditorFactory,
+    useFactory: (ctx) => (options: IEditorOptions, editorState: EditorState) => {
+        const child = ctx.container.createChild();
+        child.register({
+          token: LibroOpensumiEditorOptions,
+          useValue: options,
+        });
+        child.register({
+          token: LibroOpensumiEditorState,
+          useValue: editorState,
+        });
+        return child.get(LibroOpensumiEditor);
+      },
+  })
+  .dependOn(CodeEditorModule);