fix: restored notebook have invalid keybinding (#4174)

Co-authored-by: hacke2 <[email protected]>

Author: zhanba

packages/notebook/src/browser/libro-keybind-contribution.ts

@@ -1,42 +1,39 @@
-import { LibroSearchToggleCommand, LibroService, LibroView, NotebookCommands } from '@difizen/libro-jupyter/noeditor';
+import { LibroSearchToggleCommand, LibroService, NotebookCommands } from '@difizen/libro-jupyter/noeditor';
 import { Container, CommandRegistry as LibroCommandRegistry } from '@difizen/mana-app';
 
 import { Autowired } from '@opensumi/di';
 import {
   ClientAppContribution,
+  CommandContribution,
   CommandRegistry,
   Domain,
   IContextKeyService,
+  KeybindingContribution,
   KeybindingRegistry,
   KeybindingScope,
+  MaybePromise,
 } from '@opensumi/ide-core-browser';
 import { WorkbenchEditorService } from '@opensumi/ide-editor';
 
 import { LIBRO_COMPONENTS_SCHEME_ID } from './libro.protocol';
 import { ManaContainer } from './mana';
 
-@Domain(ClientAppContribution)
-export class LibroKeybindContribution implements ClientAppContribution {
+@Domain(ClientAppContribution, KeybindingContribution, CommandContribution)
+export class LibroKeybindContribution implements ClientAppContribution, KeybindingContribution, CommandContribution {
   @Autowired(IContextKeyService) contextKeyService: IContextKeyService;
-  @Autowired(KeybindingRegistry) keybindingRegistry: KeybindingRegistry;
   @Autowired(WorkbenchEditorService)
   workbenchEditorService: WorkbenchEditorService;
   @Autowired(CommandRegistry)
   protected readonly commandRegistry: CommandRegistry;
   @Autowired(ManaContainer)
   private readonly manaContainer: Container;
 
-  onStart() {
+  initialize(): MaybePromise<void> {
     this.registerContextKey();
-    this.registerCommand();
-    this.registerKeybind();
   }
 
   registerContextKey() {
-    const notebookFocusContext = this.contextKeyService.createKey<boolean>(
-      'libroNotebookFocused',
-      this.hasActiveNotebook(),
-    );
+    const notebookFocusContext = this.contextKeyService.createKey<boolean>('libroNotebookFocused', false);
 
     this.workbenchEditorService.onActiveResourceChange((e) => {
       if (e?.uri?.path.ext === `.${LIBRO_COMPONENTS_SCHEME_ID}`) {
@@ -55,45 +52,41 @@ export class LibroKeybindContribution implements ClientAppContribution {
     return this.manaContainer.get(LibroCommandRegistry);
   }
 
-  hasActiveNotebook() {
-    return this.libroService.active instanceof LibroView;
-  }
-
-  registerCommand() {
-    this.commandRegistry.registerCommand(NotebookCommands['EnterCommandMode'], {
+  registerCommands(commands: CommandRegistry) {
+    commands.registerCommand(NotebookCommands['EnterCommandMode'], {
       execute: () => {
         this.libroCommandRegistry.executeCommand(NotebookCommands['EnterCommandMode'].id);
       },
     });
-    this.commandRegistry.registerCommand(NotebookCommands['RunCell'], {
+    commands.registerCommand(NotebookCommands['RunCell'], {
       execute: () => {
         this.libroCommandRegistry.executeCommand(NotebookCommands['RunCell'].id);
       },
     });
-    this.commandRegistry.registerCommand(NotebookCommands['RunCellAndSelectNext'], {
+    commands.registerCommand(NotebookCommands['RunCellAndSelectNext'], {
       execute: () => {
         this.libroCommandRegistry.executeCommand(NotebookCommands['RunCellAndSelectNext'].id);
       },
     });
-    this.commandRegistry.registerCommand(NotebookCommands['RunCellAndInsertBelow'], {
+    commands.registerCommand(NotebookCommands['RunCellAndInsertBelow'], {
       execute: () => {
         this.libroCommandRegistry.executeCommand(NotebookCommands['RunCellAndInsertBelow'].id);
       },
     });
-    this.commandRegistry.registerCommand(NotebookCommands['SplitCellAntCursor'], {
+    commands.registerCommand(NotebookCommands['SplitCellAntCursor'], {
       execute: () => {
         this.libroCommandRegistry.executeCommand(NotebookCommands['SplitCellAntCursor'].id);
       },
     });
-    this.commandRegistry.registerCommand(LibroSearchToggleCommand.ShowLibroSearch, {
+    commands.registerCommand(LibroSearchToggleCommand.ShowLibroSearch, {
       execute: () => {
         this.libroCommandRegistry.executeCommand(LibroSearchToggleCommand.ShowLibroSearch.id);
       },
     });
   }
 
-  registerKeybind() {
-    this.keybindingRegistry.registerKeybindings(
+  registerKeybindings(keybindings: KeybindingRegistry): void {
+    keybindings.registerKeybindings(
       [
         {
           keybinding: 'f1',

packages/notebook/src/browser/libro/libro-opensumi-content-contribution.ts

@@ -13,7 +13,7 @@ import { ContentLoaderType, OpensumiInjector } from '../mana';
 export class LibroOpensumiContentContribution implements ContentContribution {
   @inject(OpensumiInjector) injector: Injector;
 
-  canHandle = (options) => options.loadType === ContentLoaderType ? 100 : 1;
+  canHandle = (options) => (options.loadType === ContentLoaderType ? 100 : 1);
   async loadContent(options: NotebookOption, model: LibroJupyterModel) {
     const fileServiceClient: IFileServiceClient = this.injector.get(IFileServiceClient);
     const messageService = this.injector.get(IMessageService);
@@ -33,7 +33,8 @@ export class LibroOpensumiContentContribution implements ContentContribution {
       }
       const uri = new URI(options.resource.toString());
       const currentFileContents: IContentsModel = {
-        name: uri.path.name,
+        name: uri.path.base,
+        // TODO: should be relative path to notebook root, notebook root may not be same as ide root, and jupyter provide no api to get root dir
         path: uri.path.toString(),
         last_modified: stat?.lastModification.toString() || new Date().toJSON(),
         created: stat?.createTime?.toString() || new Date().toJSON(),