@difizen/libro-lab 0.1.17 → 0.1.19

package/es/command/lab-command.d.ts

@@ -6,6 +6,7 @@ export declare const LabCommands: {
     Save: {
         id: string;
         label: string;
+        keybind: string;
     };
     CreateFile: {
         id: string;

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

@@ -1 +1 @@
-{"version":3,"file":"lab-command.d.ts","sourceRoot":"","sources":["../../src/command/lab-command.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6IvB,CAAC"}
+{"version":3,"file":"lab-command.d.ts","sourceRoot":"","sources":["../../src/command/lab-command.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8IvB,CAAC"}

package/es/command/lab-command.js

@@ -8,8 +8,9 @@ export var LabCommands = {
   //   label: '新建终端',
   // },
   Save: {
-    id: 'libro-lab-header-menu-file-save',
-    label: '保存'
+    id: 'libro-lab-save',
+    label: '保存',
+    keybind: 'ctrlcmd+s'
   },
   CreateFile: {
     id: 'libro-lab-header-menu-file-create',

package/es/command/lab-menu-contribution.d.ts

@@ -1,6 +1,8 @@
 import { LibroService } from '@difizen/libro-jupyter';
 import { TerminalManager } from '@difizen/libro-terminal';
 import type { MenuRegistry } from '@difizen/mana-app';
+import type { KeybindingRegistry } from '@difizen/mana-app';
+import { KeybindingContribution } from '@difizen/mana-app';
 import { CommandContribution, CommandRegistry, MenuContribution, ViewManager } from '@difizen/mana-app';
 import { LayoutService } from '../layout/layout-service.js';
 export declare namespace LabMenus {
@@ -11,12 +13,13 @@ export declare namespace LabMenus {
     const TERMINAL: string[];
     const HELP: string[];
 }
-export declare class LabMenu implements MenuContribution, CommandContribution {
+export declare class LabMenu implements MenuContribution, CommandContribution, KeybindingContribution {
     protected commandRegistry: CommandRegistry;
     protected libroService: LibroService;
     protected layoutService: LayoutService;
     terminalManager: TerminalManager;
     viewManager: ViewManager;
+    registerKeybindings(keybindings: KeybindingRegistry): void;
     registerMenus(menu: MenuRegistry): void;
     registerCommands(commands: CommandRegistry): void;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"lab-menu-contribution.d.ts","sourceRoot":"","sources":["../../src/command/lab-menu-contribution.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,YAAY,EAEb,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAoB,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EACL,mBAAmB,EACnB,eAAe,EAGf,gBAAgB,EAEhB,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAI5D,yBAAiB,QAAQ,CAAC;IACjB,MAAM,IAAI,UAA+B,CAAC;IAC1C,MAAM,IAAI,UAA+B,CAAC;IAC1C,MAAM,IAAI,UAA+B,CAAC;IAC1C,MAAM,GAAG,UAA8B,CAAC;IACxC,MAAM,QAAQ,UAAmC,CAAC;IAClD,MAAM,IAAI,UAA+B,CAAC;CAClD;AAED,qBACa,OAAQ,YAAW,gBAAgB,EAAE,mBAAmB;IAC1C,SAAS,CAAC,eAAe,EAAE,eAAe,CAAC;IAC9C,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IACrC,eAAe,EAAE,eAAe,CAAC;IACrC,WAAW,EAAE,WAAW,CAAC;IAE9C,aAAa,CAAC,IAAI,EAAE,YAAY;IAkLhC,gBAAgB,CAAC,QAAQ,EAAE,eAAe;CAgmB3C"}
+{"version":3,"file":"lab-menu-contribution.d.ts","sourceRoot":"","sources":["../../src/command/lab-menu-contribution.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,YAAY,EAEb,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAoB,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,OAAO,EACL,mBAAmB,EACnB,eAAe,EAGf,gBAAgB,EAEhB,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAI5D,yBAAiB,QAAQ,CAAC;IACjB,MAAM,IAAI,UAA+B,CAAC;IAC1C,MAAM,IAAI,UAA+B,CAAC;IAC1C,MAAM,IAAI,UAA+B,CAAC;IAC1C,MAAM,GAAG,UAA8B,CAAC;IACxC,MAAM,QAAQ,UAAmC,CAAC;IAClD,MAAM,IAAI,UAA+B,CAAC;CAClD;AAED,qBACa,OACX,YAAW,gBAAgB,EAAE,mBAAmB,EAAE,sBAAsB;IAE/C,SAAS,CAAC,eAAe,EAAE,eAAe,CAAC;IAC9C,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IACrC,eAAe,EAAE,eAAe,CAAC;IACrC,WAAW,EAAE,WAAW,CAAC;IAE9C,mBAAmB,CAAC,WAAW,EAAE,kBAAkB;IAOnD,aAAa,CAAC,IAAI,EAAE,YAAY;IAkLhC,gBAAgB,CAAC,QAAQ,EAAE,eAAe;CAknB3C"}

package/es/command/lab-menu-contribution.js

@@ -19,7 +19,10 @@ function _applyDecoratedDescriptor(target, property, decorators, descriptor, con
 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 { LibroJupyterView, LibroService, NotebookCommands } from '@difizen/libro-jupyter';
 import { TerminalCommands, TerminalManager } from '@difizen/libro-terminal';
+import { KeybindingContribution } from '@difizen/mana-app';
+import { Saveable } from '@difizen/mana-app';
 import { CommandContribution, CommandRegistry, inject, MAIN_MENU_BAR, MenuContribution, singleton, ViewManager } from '@difizen/mana-app';
+import { LibroLabLayoutSlots } from "../layout/index.js";
 import { LayoutService } from "../layout/layout-service.js";
 import { LabCommands } from "./lab-command.js";
 export var LabMenus;
@@ -32,7 +35,7 @@ export var LabMenus;
   var HELP = _LabMenus.HELP = [].concat(_toConsumableArray(MAIN_MENU_BAR), ['6_help']);
 })(LabMenus || (LabMenus = {}));
 export var LabMenu = (_dec = singleton({
-  contrib: [MenuContribution, CommandContribution]
+  contrib: [MenuContribution, CommandContribution, KeybindingContribution]
 }), _dec2 = inject(CommandRegistry), _dec3 = inject(LibroService), _dec4 = inject(LayoutService), _dec5 = inject(TerminalManager), _dec6 = inject(ViewManager), _dec(_class = (_class2 = /*#__PURE__*/function () {
   function LabMenu() {
     _classCallCheck(this, LabMenu);
@@ -43,6 +46,14 @@ export var LabMenu = (_dec = singleton({
     _initializerDefineProperty(this, "viewManager", _descriptor5, this);
   }
   _createClass(LabMenu, [{
+    key: "registerKeybindings",
+    value: function registerKeybindings(keybindings) {
+      keybindings.registerKeybinding({
+        command: LabCommands.Save.id,
+        keybinding: LabCommands.Save.keybind
+      });
+    }
+  }, {
     key: "registerMenus",
     value: function registerMenus(menu) {
       menu.registerSubmenu(LabMenus.FILE, {
@@ -274,12 +285,19 @@ export var LabMenu = (_dec = singleton({
           return execute;
         }()
       });
-      commands.registerCommand(LabCommands.Save, {
+      commands.registerCommand(LabCommands.Save);
+      commands.registerHandler(LabCommands.Save.id, {
         execute: function () {
           var _execute2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+            var contentActive;
             return _regeneratorRuntime().wrap(function _callee2$(_context2) {
               while (1) switch (_context2.prev = _context2.next) {
                 case 0:
+                  contentActive = _this.layoutService.getActiveView(LibroLabLayoutSlots.content);
+                  if (contentActive && Saveable.is(contentActive)) {
+                    contentActive.save();
+                  }
+                case 2:
                 case "end":
                   return _context2.stop();
               }
@@ -289,7 +307,18 @@ export var LabMenu = (_dec = singleton({
             return _execute2.apply(this, arguments);
           }
           return execute;
-        }()
+        }(),
+        isEnabled: function isEnabled() {
+          var _contentActive$contai;
+          var contentActive = _this.layoutService.getActiveView(LibroLabLayoutSlots.content);
+          if (contentActive && (_contentActive$contai = contentActive.container) !== null && _contentActive$contai !== void 0 && _contentActive$contai.current) {
+            var contentHost = contentActive.container.current;
+            if (contentHost.contains(document.activeElement)) {
+              return true;
+            }
+          }
+          return false;
+        }
       });
       commands.registerCommandWithContext(LabCommands.UndoCellAction, this, {
         execute: function () {

package/es/kernel-and-terminal-panel/kernel-and-terminal-panel-view.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="react" resolution-mode="require"/>
 import { LibroKernelManager, LibroSessionManager } from '@difizen/libro-kernel';
-import type { ILanguageServerManager } from '@difizen/libro-lsp';
-import { ILSPDocumentConnectionManager } from '@difizen/libro-lsp';
+import { LibroLanguageClientManager } from '@difizen/libro-language-client';
 import { TerminalManager } from '@difizen/libro-terminal';
 import { BaseView, CommandRegistry, ViewManager } from '@difizen/mana-app';
 import type { SaveableTabView } from '../index.js';
@@ -15,10 +14,9 @@ export declare class KernelAndTerminalPanelView extends BaseView {
     libroKernelManager: LibroKernelManager;
     libroSessionManager: LibroSessionManager;
     terminalManager: TerminalManager;
-    lspConnectionManager: ILSPDocumentConnectionManager;
-    lspManager: ILanguageServerManager;
+    libroLanguageClientManager: LibroLanguageClientManager;
     commandRegistry: CommandRegistry;
-    constructor(libroKernelManager: LibroKernelManager, libroSessionManager: LibroSessionManager, terminalManager: TerminalManager, lspDocumentConnectionManager: ILSPDocumentConnectionManager, commandRegistry: CommandRegistry);
+    constructor(libroKernelManager: LibroKernelManager, libroSessionManager: LibroSessionManager, terminalManager: TerminalManager, libroLanguageClientManager: LibroLanguageClientManager, commandRegistry: CommandRegistry);
     getAllOpenedTabView(): SaveableTabView;
     refresh(): void;
 }

package/es/kernel-and-terminal-panel/kernel-and-terminal-panel-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kernel-and-terminal-panel-view.d.ts","sourceRoot":"","sources":["../../src/kernel-and-terminal-panel/kernel-and-terminal-panel-view.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAChF,OAAO,KAAK,EAAE,sBAAsB,EAAqB,MAAM,oBAAoB,CAAC;AACpF,OAAO,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAoB,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC5E,OAAO,EACL,QAAQ,EACR,eAAe,EAMf,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAI3B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAQ5D,OAAO,cAAc,CAAC;AA0JtB,eAAO,MAAM,4BAA4B,mCAAmC,CAAC;AAE7E,qBAEa,0BAA2B,SAAQ,QAAQ;IAC7C,IAAI,yBAAe;IACP,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACjC,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IAE9D,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,eAAe,EAAE,eAAe,CAAC;IACjC,oBAAoB,EAAE,6BAA6B,CAAC;IACpD,UAAU,EAAE,sBAAsB,CAAC;IACnC,eAAe,EAAE,eAAe,CAAC;gBAGH,kBAAkB,EAAE,kBAAkB,EACrC,mBAAmB,EAAE,mBAAmB,EAC5C,eAAe,EAAE,eAAe,EAEzD,4BAA4B,EAAE,6BAA6B,EAClC,eAAe,EAAE,eAAe;IAc3D,mBAAmB,IAAI,eAAe;IAMtC,OAAO;CAKR"}
+{"version":3,"file":"kernel-and-terminal-panel-view.d.ts","sourceRoot":"","sources":["../../src/kernel-and-terminal-panel/kernel-and-terminal-panel-view.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAChF,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAC5E,OAAO,EAAoB,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC5E,OAAO,EACL,QAAQ,EACR,eAAe,EAMf,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAI3B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAQ5D,OAAO,cAAc,CAAC;AAsJtB,eAAO,MAAM,4BAA4B,mCAAmC,CAAC;AAE7E,qBAEa,0BAA2B,SAAQ,QAAQ;IAC7C,IAAI,yBAAe;IACP,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACjC,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IAE9D,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,eAAe,EAAE,eAAe,CAAC;IACjC,0BAA0B,EAAE,0BAA0B,CAAC;IACvD,eAAe,EAAE,eAAe,CAAC;gBAGH,kBAAkB,EAAE,kBAAkB,EACrC,mBAAmB,EAAE,mBAAmB,EAC5C,eAAe,EAAE,eAAe,EAEzD,0BAA0B,EAAE,0BAA0B,EAC7B,eAAe,EAAE,eAAe;IAa3D,mBAAmB,IAAI,eAAe;IAMtC,OAAO;CAKR"}

package/es/kernel-and-terminal-panel/kernel-and-terminal-panel-view.js

@@ -30,7 +30,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { LibroKernelManager, LibroSessionManager } from '@difizen/libro-kernel';
-import { ILSPDocumentConnectionManager } from '@difizen/libro-lsp';
+import { LibroLanguageClientManager } from '@difizen/libro-language-client';
 import { TerminalCommands, TerminalManager } from '@difizen/libro-terminal';
 import { BaseView, CommandRegistry, inject, singleton, useInject, view, ViewInstance, ViewManager } from '@difizen/mana-app';
 import { useEffect, useState } from 'react';
@@ -47,8 +47,7 @@ var PanelRender = function PanelRender() {
   var libroKernelManager = instance.libroKernelManager,
     libroSessionManager = instance.libroSessionManager,
     terminalManager = instance.terminalManager,
-    lspManager = instance.lspManager,
-    lspConnectionManager = instance.lspConnectionManager,
+    libroLanguageClientManager = instance.libroLanguageClientManager,
     commandRegistry = instance.commandRegistry;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
@@ -58,17 +57,12 @@ var PanelRender = function PanelRender() {
     _useState4 = _slicedToArray(_useState3, 2),
     terminalItems = _useState4[0],
     setTerminalItems = _useState4[1];
-
-  // const lspManager = useInject<ILSPDocumentConnectionManager>(
-  //   DocumentConnectionManager,
-  // ).languageServerManager;
-
   var _useState5 = useState(),
     _useState6 = _slicedToArray(_useState5, 2),
     lspItems = _useState6[0],
     setLSPItems = _useState6[1];
-  lspManager.sessionsChanged(function () {
-    var sessions = lspManager.sessions;
+  libroLanguageClientManager.sessionsChanged(function () {
+    var sessions = libroLanguageClientManager.sessions;
     var items = [];
     sessions.forEach(function (session, key) {
       items.push({
@@ -80,7 +74,7 @@ var PanelRender = function PanelRender() {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
                   _context.next = 2;
-                  return lspConnectionManager.disconnectServer(key);
+                  return libroLanguageClientManager.closeLanguageClient(key);
                 case 2:
                   return _context.abrupt("return", _context.sent);
                 case 3:
@@ -282,7 +276,7 @@ var PanelRender = function PanelRender() {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
               _context7.next = 2;
-              return lspConnectionManager.disconnectAllServers();
+              return libroLanguageClientManager.closeAllLanguageClient();
             case 2:
               return _context7.abrupt("return", _context7.sent);
             case 3:
@@ -298,7 +292,7 @@ export var KernelAndTerminalPanelViewId = 'libro-kernel-and-terminal-view';
 export var KernelAndTerminalPanelView = (_dec = singleton(), _dec2 = view(KernelAndTerminalPanelViewId), _dec3 = inject(ViewManager), _dec4 = inject(LayoutService), _dec(_class = _dec2(_class = (_class2 = /*#__PURE__*/function (_BaseView) {
   _inherits(KernelAndTerminalPanelView, _BaseView);
   var _super = _createSuper(KernelAndTerminalPanelView);
-  function KernelAndTerminalPanelView(libroKernelManager, libroSessionManager, terminalManager, lspDocumentConnectionManager, commandRegistry) {
+  function KernelAndTerminalPanelView(libroKernelManager, libroSessionManager, terminalManager, libroLanguageClientManager, commandRegistry) {
     var _this;
     _classCallCheck(this, KernelAndTerminalPanelView);
     _this = _super.call(this);
@@ -310,13 +304,12 @@ export var KernelAndTerminalPanelView = (_dec = singleton(), _dec2 = view(Kernel
     _this.libroKernelManager = libroKernelManager;
     _this.libroSessionManager = libroSessionManager;
     _this.terminalManager = terminalManager;
-    _this.lspConnectionManager = lspDocumentConnectionManager;
-    _this.lspManager = lspDocumentConnectionManager.languageServerManager;
+    _this.libroLanguageClientManager = libroLanguageClientManager;
     _this.commandRegistry = commandRegistry;
     return _this;
   }
   KernelAndTerminalPanelView = inject(CommandRegistry)(KernelAndTerminalPanelView, undefined, 4) || KernelAndTerminalPanelView;
-  KernelAndTerminalPanelView = inject(ILSPDocumentConnectionManager)(KernelAndTerminalPanelView, undefined, 3) || KernelAndTerminalPanelView;
+  KernelAndTerminalPanelView = inject(LibroLanguageClientManager)(KernelAndTerminalPanelView, undefined, 3) || KernelAndTerminalPanelView;
   KernelAndTerminalPanelView = inject(TerminalManager)(KernelAndTerminalPanelView, undefined, 2) || KernelAndTerminalPanelView;
   KernelAndTerminalPanelView = inject(LibroSessionManager)(KernelAndTerminalPanelView, undefined, 1) || KernelAndTerminalPanelView;
   KernelAndTerminalPanelView = inject(LibroKernelManager)(KernelAndTerminalPanelView, undefined, 0) || KernelAndTerminalPanelView;
@@ -330,7 +323,7 @@ export var KernelAndTerminalPanelView = (_dec = singleton(), _dec2 = view(Kernel
     value: function refresh() {
       this.libroSessionManager.refreshRunning();
       this.terminalManager.refreshRunning();
-      this.lspManager.refreshRunning();
+      this.libroLanguageClientManager.refreshRunning();
     }
   }]);
   return KernelAndTerminalPanelView;

package/es/kernel-and-terminal-panel/panel-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"panel-command.d.ts","sourceRoot":"","sources":["../../src/kernel-and-terminal-panel/panel-command.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EACL,mBAAmB,EAInB,mBAAmB,EACpB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AAEjF,eAAO,MAAM,YAAY;;;;;CAKxB,CAAC;AAEF,qBAGa,wBACX,YAAW,mBAAmB,EAAE,mBAAmB;IAEnD,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IAGnC,0BAA0B,EAAE,0BAA0B,CAAC;gBAEtB,WAAW,EAAE,WAAW;IAIzD,gBAAgB,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;IAahD,oBAAoB,CAAC,eAAe,EAAE,eAAe,GAAG,IAAI;CAQ7D"}
+{"version":3,"file":"panel-command.d.ts","sourceRoot":"","sources":["../../src/kernel-and-terminal-panel/panel-command.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EACL,mBAAmB,EAGnB,mBAAmB,EACpB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AAEjF,eAAO,MAAM,YAAY;;;;;CAKxB,CAAC;AAEF,qBAGa,wBACX,YAAW,mBAAmB,EAAE,mBAAmB;IAEnD,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IAGnC,0BAA0B,EAAE,0BAA0B,CAAC;gBAEtB,WAAW,EAAE,WAAW;IAIzD,gBAAgB,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;IAahD,oBAAoB,CAAC,eAAe,EAAE,eAAe,GAAG,IAAI;CAQ7D"}

package/es/kernel-and-terminal-panel/panel-command.js

@@ -13,7 +13,7 @@ function _applyDecoratedDescriptor(target, property, decorators, descriptor, con
 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 { ReloadOutlined } from '@ant-design/icons';
 import { ViewManager } from '@difizen/mana-app';
-import { CommandContribution, inject, MenuContribution, singleton, ToolbarContribution } from '@difizen/mana-app';
+import { CommandContribution, inject, singleton, ToolbarContribution } from '@difizen/mana-app';
 import { KernelAndTerminalPanelView } from "./kernel-and-terminal-panel-view.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 export var PanelCommand = {
@@ -23,7 +23,7 @@ export var PanelCommand = {
   }
 };
 export var PanelCommandContribution = (_dec = singleton({
-  contrib: [CommandContribution, MenuContribution, ToolbarContribution]
+  contrib: [CommandContribution, ToolbarContribution]
 }), _dec2 = inject(KernelAndTerminalPanelView), _dec(_class = (_class2 = /*#__PURE__*/function () {
   function PanelCommandContribution(viewManager) {
     _classCallCheck(this, PanelCommandContribution);

package/es/layout/layout-service.d.ts

@@ -1,6 +1,7 @@
 import { LibroService } from '@difizen/libro-jupyter';
 import type { View, ViewOpenHandlerOptions, ViewOpenOption } from '@difizen/mana-app';
 import { SlotViewManager } from '@difizen/mana-app';
+import type { Disposable } from '@difizen/mana-common';
 import type { LibroLabLayoutSlotsType, StatusType } from './protocol.js';
 export type VisibilityMap = Record<LibroLabLayoutSlotsType, boolean>;
 export declare class LayoutService {
@@ -15,7 +16,7 @@ export declare class LayoutService {
     addView(view: View, option?: ViewOpenHandlerOptions): Promise<void>;
     getAllSlotView(slot: LibroLabLayoutSlotsType): View | undefined;
     getActiveView(slot: LibroLabLayoutSlotsType): View | undefined;
-    onSlotActiveChange(slot: LibroLabLayoutSlotsType, handler: () => void): import("@difizen/mana-app").Disposable | undefined;
+    onSlotActiveChange(slot: LibroLabLayoutSlotsType, handler: () => void): Disposable | undefined;
     shouldRenderNavigatorContent(): boolean;
     onOpenSlotActiveChange(): Promise<void>;
 }

package/es/layout/layout-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layout-service.d.ts","sourceRoot":"","sources":["../../src/layout/layout-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC5E,OAAO,KAAK,EAAE,IAAI,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGtF,OAAO,EAKL,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,uBAAuB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAGzE,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;AACrE,qBACa,aAAa;IACxB,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IACpD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;gBAGnB,eAAe,EAAE,eAAe,EACnC,YAAY,EAAE,YAAY;IAWlD,WAAW,EAAE,UAAU,CAAa;IAGpC,aAAa,EAAE,aAAa,CAS1B;IAEF,aAAa,CAAC,IAAI,EAAE,uBAAuB,GAAG,OAAO;IAIrD,cAAc,CAAC,IAAI,EAAE,uBAAuB,EAAE,OAAO,EAAE,OAAO;IAI9D,SAAS,CAAC,WAAW,CACnB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,IAAI,GAAG,SAAS,EACtB,MAAM,EAAE,cAAc,GAAG,SAAS;IAa9B,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAQzE,cAAc,CAAC,IAAI,EAAE,uBAAuB;IAI5C,aAAa,CAAC,IAAI,EAAE,uBAAuB;IAU3C,kBAAkB,CAAC,IAAI,EAAE,uBAAuB,EAAE,OAAO,EAAE,MAAM,IAAI;IAUrE,4BAA4B,IAAI,OAAO;IAWjC,sBAAsB;CAoB7B"}
+{"version":3,"file":"layout-service.d.ts","sourceRoot":"","sources":["../../src/layout/layout-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC5E,OAAO,KAAK,EAAE,IAAI,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGtF,OAAO,EAKL,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,KAAK,EAAE,uBAAuB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAGzE,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;AACrE,qBACa,aAAa;IACxB,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IACpD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;gBAGnB,eAAe,EAAE,eAAe,EACnC,YAAY,EAAE,YAAY;IAWlD,WAAW,EAAE,UAAU,CAAa;IAGpC,aAAa,EAAE,aAAa,CAS1B;IAEF,aAAa,CAAC,IAAI,EAAE,uBAAuB,GAAG,OAAO;IAIrD,cAAc,CAAC,IAAI,EAAE,uBAAuB,EAAE,OAAO,EAAE,OAAO;IAI9D,SAAS,CAAC,WAAW,CACnB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,IAAI,GAAG,SAAS,EACtB,MAAM,EAAE,cAAc,GAAG,SAAS;IAa9B,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAQzE,cAAc,CAAC,IAAI,EAAE,uBAAuB;IAI5C,aAAa,CAAC,IAAI,EAAE,uBAAuB;IAU3C,kBAAkB,CAChB,IAAI,EAAE,uBAAuB,EAC7B,OAAO,EAAE,MAAM,IAAI,GAClB,UAAU,GAAG,SAAS;IAUzB,4BAA4B,IAAI,OAAO;IAWjC,sBAAsB;CAoB7B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-lab",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "description": "",
   "keywords": [
     "libro",
@@ -34,15 +34,16 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^5.1.0",
-    "@difizen/libro-core": "^0.1.17",
-    "@difizen/libro-jupyter": "^0.1.17",
-    "@difizen/libro-kernel": "^0.1.17",
-    "@difizen/libro-prompt-cell": "^0.1.17",
-    "@difizen/libro-terminal": "^0.1.17",
-    "@difizen/libro-lsp": "^0.1.17",
-    "@difizen/libro-toc": "^0.1.17",
-    "@difizen/libro-cofine-editor-core": "^0.1.17",
+    "@difizen/libro-core": "^0.1.19",
+    "@difizen/libro-jupyter": "^0.1.19",
+    "@difizen/libro-kernel": "^0.1.19",
+    "@difizen/libro-prompt-cell": "^0.1.19",
+    "@difizen/libro-terminal": "^0.1.19",
+    "@difizen/libro-toc": "^0.1.19",
+    "@difizen/libro-cofine-editor-core": "^0.1.19",
+    "@difizen/libro-language-client": "^0.1.19",
     "@difizen/mana-app": "latest",
+    "@difizen/mana-common": "latest",
     "@difizen/mana-react": "latest",
     "classnames": "^2.3.2",
     "uuid": "^9.0.0",

package/src/command/lab-command.ts

@@ -8,8 +8,9 @@ export const LabCommands = {
   //   label: '新建终端',
   // },
   Save: {
-    id: 'libro-lab-header-menu-file-save',
+    id: 'libro-lab-save',
     label: '保存',
+    keybind: 'ctrlcmd+s',
   },
   CreateFile: {
     id: 'libro-lab-header-menu-file-create',

package/src/command/lab-menu-contribution.ts

@@ -6,6 +6,9 @@ import {
 } from '@difizen/libro-jupyter';
 import { TerminalCommands, TerminalManager } from '@difizen/libro-terminal';
 import type { MenuRegistry } from '@difizen/mana-app';
+import type { KeybindingRegistry } from '@difizen/mana-app';
+import { KeybindingContribution } from '@difizen/mana-app';
+import { Saveable } from '@difizen/mana-app';
 import {
   CommandContribution,
   CommandRegistry,
@@ -16,6 +19,7 @@ import {
   ViewManager,
 } from '@difizen/mana-app';
 
+import { LibroLabLayoutSlots } from '../layout/index.js';
 import { LayoutService } from '../layout/layout-service.js';
 
 import { LabCommands } from './lab-command.js';
@@ -29,14 +33,23 @@ export namespace LabMenus {
   export const HELP = [...MAIN_MENU_BAR, '6_help'];
 }
 
-@singleton({ contrib: [MenuContribution, CommandContribution] })
-export class LabMenu implements MenuContribution, CommandContribution {
+@singleton({ contrib: [MenuContribution, CommandContribution, KeybindingContribution] })
+export class LabMenu
+  implements MenuContribution, CommandContribution, KeybindingContribution
+{
   @inject(CommandRegistry) protected commandRegistry: CommandRegistry;
   @inject(LibroService) protected libroService: LibroService;
   @inject(LayoutService) protected layoutService: LayoutService;
   @inject(TerminalManager) terminalManager: TerminalManager;
   @inject(ViewManager) viewManager: ViewManager;
 
+  registerKeybindings(keybindings: KeybindingRegistry) {
+    keybindings.registerKeybinding({
+      command: LabCommands.Save.id,
+      keybinding: LabCommands.Save.keybind,
+    });
+  }
+
   registerMenus(menu: MenuRegistry) {
     menu.registerSubmenu(LabMenus.FILE, { label: '文件' });
     menu.registerSubmenu(LabMenus.EDIT, { label: '编辑' });
@@ -240,9 +253,27 @@ export class LabMenu implements MenuContribution, CommandContribution {
         //TODO: 关于
       },
     });
-    commands.registerCommand(LabCommands.Save, {
+    commands.registerCommand(LabCommands.Save);
+    commands.registerHandler(LabCommands.Save.id, {
       execute: async () => {
-        //TODO: 保存
+        const contentActive = this.layoutService.getActiveView(
+          LibroLabLayoutSlots.content,
+        );
+        if (contentActive && Saveable.is(contentActive)) {
+          contentActive.save();
+        }
+      },
+      isEnabled: () => {
+        const contentActive = this.layoutService.getActiveView(
+          LibroLabLayoutSlots.content,
+        );
+        if (contentActive && contentActive.container?.current) {
+          const contentHost = contentActive.container.current;
+          if (contentHost.contains(document.activeElement)) {
+            return true;
+          }
+        }
+        return false;
       },
     });
     commands.registerCommandWithContext(LabCommands.UndoCellAction, this, {

package/src/editor-viewer/code-editor-viewer.tsx

@@ -137,8 +137,8 @@ export class CodeEditorViewer extends BaseView implements NavigatableView, Savea
       uri,
       value: content,
     };
-
     this.e2Editor = editorPorvider.create(this.codeRef.current, options);
+
     this.toDispose.push(
       getOrigin(this.e2Editor.codeEditor).onDidChangeModelContent(() => {
         this.dirty = true;

package/src/kernel-and-terminal-panel/kernel-and-terminal-panel-view.tsx

@@ -1,6 +1,5 @@
 import { LibroKernelManager, LibroSessionManager } from '@difizen/libro-kernel';
-import type { ILanguageServerManager, TLanguageServerId } from '@difizen/libro-lsp';
-import { ILSPDocumentConnectionManager } from '@difizen/libro-lsp';
+import { LibroLanguageClientManager } from '@difizen/libro-language-client';
 import { TerminalCommands, TerminalManager } from '@difizen/libro-terminal';
 import {
   BaseView,
@@ -35,8 +34,7 @@ const PanelRender: React.FC = () => {
     libroKernelManager,
     libroSessionManager,
     terminalManager,
-    lspManager,
-    lspConnectionManager,
+    libroLanguageClientManager,
     commandRegistry,
   } = instance;
 
@@ -48,14 +46,10 @@ const PanelRender: React.FC = () => {
     LibroPanelCollapseItem[] | undefined
   >();
 
-  // const lspManager = useInject<ILSPDocumentConnectionManager>(
-  //   DocumentConnectionManager,
-  // ).languageServerManager;
-
   const [lspItems, setLSPItems] = useState<LibroPanelCollapseItem[] | undefined>();
 
-  lspManager.sessionsChanged(() => {
-    const sessions = lspManager.sessions;
+  libroLanguageClientManager.sessionsChanged(() => {
+    const sessions = libroLanguageClientManager.sessions;
 
     const items = [] as LibroPanelCollapseItem[];
 
@@ -63,8 +57,7 @@ const PanelRender: React.FC = () => {
       items.push({
         id: key,
         name: `${key} (${session.spec.languages.join('/')})`,
-        shutdown: async () =>
-          await lspConnectionManager.disconnectServer(key as TLanguageServerId),
+        shutdown: async () => await libroLanguageClientManager.closeLanguageClient(key),
       });
     });
 
@@ -173,7 +166,9 @@ const PanelRender: React.FC = () => {
       <LibroCollapse
         type={LibroPanelCollapseItemType.LSP}
         items={lspItems}
-        shutdownAll={async () => await lspConnectionManager.disconnectAllServers()}
+        shutdownAll={async () =>
+          await libroLanguageClientManager.closeAllLanguageClient()
+        }
       />
     </div>
   );
@@ -191,16 +186,15 @@ export class KernelAndTerminalPanelView extends BaseView {
   libroKernelManager: LibroKernelManager;
   libroSessionManager: LibroSessionManager;
   terminalManager: TerminalManager;
-  lspConnectionManager: ILSPDocumentConnectionManager;
-  lspManager: ILanguageServerManager;
+  libroLanguageClientManager: LibroLanguageClientManager;
   commandRegistry: CommandRegistry;
 
   constructor(
     @inject(LibroKernelManager) libroKernelManager: LibroKernelManager,
     @inject(LibroSessionManager) libroSessionManager: LibroSessionManager,
     @inject(TerminalManager) terminalManager: TerminalManager,
-    @inject(ILSPDocumentConnectionManager)
-    lspDocumentConnectionManager: ILSPDocumentConnectionManager,
+    @inject(LibroLanguageClientManager)
+    libroLanguageClientManager: LibroLanguageClientManager,
     @inject(CommandRegistry) commandRegistry: CommandRegistry,
   ) {
     super();
@@ -210,8 +204,7 @@ export class KernelAndTerminalPanelView extends BaseView {
     this.libroKernelManager = libroKernelManager;
     this.libroSessionManager = libroSessionManager;
     this.terminalManager = terminalManager;
-    this.lspConnectionManager = lspDocumentConnectionManager;
-    this.lspManager = lspDocumentConnectionManager.languageServerManager;
+    this.libroLanguageClientManager = libroLanguageClientManager;
     this.commandRegistry = commandRegistry;
   }
 
@@ -224,6 +217,6 @@ export class KernelAndTerminalPanelView extends BaseView {
   refresh() {
     this.libroSessionManager.refreshRunning();
     this.terminalManager.refreshRunning();
-    this.lspManager.refreshRunning();
+    this.libroLanguageClientManager.refreshRunning();
   }
 }

package/src/kernel-and-terminal-panel/panel-command.tsx

@@ -4,7 +4,6 @@ import { ViewManager } from '@difizen/mana-app';
 import {
   CommandContribution,
   inject,
-  MenuContribution,
   singleton,
   ToolbarContribution,
 } from '@difizen/mana-app';
@@ -19,7 +18,7 @@ export const PanelCommand = {
 };
 
 @singleton({
-  contrib: [CommandContribution, MenuContribution, ToolbarContribution],
+  contrib: [CommandContribution, ToolbarContribution],
 })
 export class PanelCommandContribution
   implements CommandContribution, ToolbarContribution

package/src/layout/layout-service.ts

@@ -9,6 +9,7 @@ import {
   singleton,
   SlotViewManager,
 } from '@difizen/mana-app';
+import type { Disposable } from '@difizen/mana-common';
 
 import type { LibroLabLayoutSlotsType, StatusType } from './protocol.js';
 import { LibroLabLayoutSlots } from './protocol.js';
@@ -92,7 +93,10 @@ export class LayoutService {
     return undefined;
   }
 
-  onSlotActiveChange(slot: LibroLabLayoutSlotsType, handler: () => void) {
+  onSlotActiveChange(
+    slot: LibroLabLayoutSlotsType,
+    handler: () => void,
+  ): Disposable | undefined {
     if (this.isAreaVisible(slot)) {
       const slotView = this.slotViewManager.getSlotView(slot);
       if (slotView instanceof DefaultSlotView) {