fix: shutdown lsp sever

difizen · Jan 25, 2024 · a02c8c5 · a02c8c5
1 parent f5a3184
commit a02c8c5
Show file tree

Hide file tree

Showing 35 changed files with 94 additions and 84 deletions.
diff --git a/apps/docs/.dumi/tsconfig.json b/apps/docs/.dumi/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "extends": "../tsconfig.json",
   "compilerOptions": {
-    "rootDir": "/",
-  },
+    "rootDir": "/"
+  }
 }
diff --git a/apps/docs/tsconfig.json b/apps/docs/tsconfig.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "es",
-    "declarationDir": "es",
+    "declarationDir": "es"
   },
   "types": ["jest"],
   "exclude": ["node_modules"],
-  "include": ["src"],
+  "include": ["src"]
 }
diff --git a/package.json b/package.json
@@ -14,6 +14,7 @@
     "build": "nx run-many --target=build",
     "lint": "nx run-many --target=lint:prettier,lint",
     "lint:prettier": "prettier --check --ignore-unknown .",
+    "prettier": "prettier --ignore-unknown . --write",
     "lint-staged": "lint-staged",
     "test": "nx run-many --target=test",
     "ci:setup": "nx run-many --target=setup",

diff --git a/packages/libro-code-cell/tsconfig.json b/packages/libro-code-cell/tsconfig.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "es",
-    "declarationDir": "es",
+    "declarationDir": "es"
   },
   "types": ["jest"],
   "exclude": ["node_modules"],
-  "include": ["src"],
+  "include": ["src"]
 }
diff --git a/packages/libro-code-editor/tsconfig.json b/packages/libro-code-editor/tsconfig.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "es",
-    "declarationDir": "es",
+    "declarationDir": "es"
   },
   "types": ["jest"],
   "exclude": ["node_modules"],
-  "include": ["src"],
+  "include": ["src"]
 }
diff --git a/packages/libro-codemirror/src/auto-complete/state.ts b/packages/libro-codemirror/src/auto-complete/state.ts
@@ -167,9 +167,10 @@ export class CompletionState {
     const sources =
       conf.override ||
       state
-        .languageDataAt<
-          CompletionSource | readonly (string | Completion)[]
-        >('autocomplete', cur(state))
+        .languageDataAt<CompletionSource | readonly (string | Completion)[]>(
+          'autocomplete',
+          cur(state),
+        )
         .map(asSource);
     let active: readonly ActiveSource[] = sources.map((source) => {
       const value =

diff --git a/packages/libro-codemirror/tsconfig.json b/packages/libro-codemirror/tsconfig.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "es",
-    "declarationDir": "es",
+    "declarationDir": "es"
   },
   "types": ["jest"],
   "exclude": ["node_modules"],
-  "include": ["src"],
+  "include": ["src"]
 }
diff --git a/packages/libro-cofine-editor-contribution/tsconfig.json b/packages/libro-cofine-editor-contribution/tsconfig.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "es",
-    "declarationDir": "es",
+    "declarationDir": "es"
   },
   "types": ["jest"],
   "exclude": ["node_modules"],
-  "include": ["src", "typings"],
+  "include": ["src", "typings"]
 }
diff --git a/packages/libro-cofine-editor-core/tsconfig.json b/packages/libro-cofine-editor-core/tsconfig.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "rootDir": ".",
     "outDir": "es",
-    "declarationDir": "es",
+    "declarationDir": "es"
   },
   "types": ["jest"],
   "exclude": ["node_modules"],
-  "include": ["src", "typings", "package.json"],
+  "include": ["src", "typings", "package.json"]
 }
diff --git a/packages/libro-cofine-editor/tsconfig.json b/packages/libro-cofine-editor/tsconfig.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "es",
-    "declarationDir": "es",
+    "declarationDir": "es"
   },
   "types": ["jest"],
   "exclude": ["node_modules"],
-  "include": ["src", "typings"],
+  "include": ["src", "typings"]
 }
diff --git a/packages/libro-cofine-textmate/tsconfig.json b/packages/libro-cofine-textmate/tsconfig.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "es",
-    "declarationDir": "es",
+    "declarationDir": "es"
   },
   "types": ["jest"],
   "exclude": ["node_modules"],
-  "include": ["src", "typings"],
+  "include": ["src", "typings"]
 }
diff --git a/packages/libro-common/tsconfig.json b/packages/libro-common/tsconfig.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "es",
-    "declarationDir": "es",
+    "declarationDir": "es"
   },
   "types": ["jest"],
   "exclude": ["node_modules"],
-  "include": ["src"],
+  "include": ["src"]
 }
diff --git a/packages/libro-core/tsconfig.json b/packages/libro-core/tsconfig.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "es",
-    "declarationDir": "es",
+    "declarationDir": "es"
   },
   "types": ["jest"],
   "exclude": ["node_modules"],
-  "include": ["src"],
+  "include": ["src"]
 }
diff --git a/packages/libro-jupyter/tsconfig.json b/packages/libro-jupyter/tsconfig.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "es",
-    "declarationDir": "es",
+    "declarationDir": "es"
   },
   "types": ["jest"],
   "exclude": ["node_modules"],
-  "include": ["src"],
+  "include": ["src"]
 }
diff --git a/packages/libro-kernel/tsconfig.json b/packages/libro-kernel/tsconfig.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "es",
-    "declarationDir": "es",
+    "declarationDir": "es"
   },
   "types": ["jest"],
   "exclude": ["node_modules"],
-  "include": ["src"],
+  "include": ["src"]
 }
diff --git a/packages/libro-l10n/tsconfig.json b/packages/libro-l10n/tsconfig.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "es",
-    "declarationDir": "es",
+    "declarationDir": "es"
   },
   "types": ["jest"],
   "exclude": ["node_modules"],
-  "include": ["src"],
+  "include": ["src"]
 }
diff --git a/packages/libro-lab/src/kernel-and-terminal-panel/kernel-and-terminal-panel-view.tsx b/packages/libro-lab/src/kernel-and-terminal-panel/kernel-and-terminal-panel-view.tsx
@@ -1,7 +1,6 @@
 import { LibroKernelManager, LibroSessionManager } from '@difizen/libro-kernel';
-import { DocumentConnectionManager } from '@difizen/libro-lsp';
-import type { ILanguageServerManager } from '@difizen/libro-lsp';
-import type { ILSPDocumentConnectionManager } from '@difizen/libro-lsp';
+import type { ILanguageServerManager, TLanguageServerId } from '@difizen/libro-lsp';
+import { ILSPDocumentConnectionManager } from '@difizen/libro-lsp';
 import { TerminalManager } from '@difizen/libro-terminal';
 import {
   BaseView,
@@ -31,8 +30,13 @@ const PanelRender: React.FC = () => {
   const instance = useInject<KernelAndTerminalPanelView>(ViewInstance);
   const openedTabView = instance.getAllOpenedTabView();
 
-  const { libroKernelManager, libroSessionManager, terminalManager, lspManager } =
-    instance;
+  const {
+    libroKernelManager,
+    libroSessionManager,
+    terminalManager,
+    lspManager,
+    lspConnectionManager,
+  } = instance;
 
   const [kernelItems, setKernelItems] = useState<
     LibroPanelCollapseKernelItem[] | undefined
@@ -57,7 +61,8 @@ const PanelRender: React.FC = () => {
       items.push({
         id: key,
         name: `${key} (${session.spec.languages.join('/')})`,
-        shutdown: async () => lspManager.shutdown(key),
+        shutdown: async () =>
+          lspConnectionManager.disconnectServer(key as TLanguageServerId),
       });
     });
 
@@ -160,7 +165,7 @@ const PanelRender: React.FC = () => {
       <LibroCollapse
         type={LibroPanelCollapseItemType.LSP}
         items={lspItems}
-        shutdownAll={() => lspManager.shutdownAll()}
+        shutdownAll={async () => lspConnectionManager.disconnectAllServers()}
       />
     </div>
   );
@@ -178,13 +183,14 @@ export class KernelAndTerminalPanelView extends BaseView {
   libroKernelManager: LibroKernelManager;
   libroSessionManager: LibroSessionManager;
   terminalManager: TerminalManager;
+  lspConnectionManager: ILSPDocumentConnectionManager;
   lspManager: ILanguageServerManager;
 
   constructor(
     @inject(LibroKernelManager) libroKernelManager: LibroKernelManager,
     @inject(LibroSessionManager) libroSessionManager: LibroSessionManager,
     @inject(TerminalManager) terminalManager: TerminalManager,
-    @inject(DocumentConnectionManager)
+    @inject(ILSPDocumentConnectionManager)
     lspDocumentConnectionManager: ILSPDocumentConnectionManager,
   ) {
     super();
@@ -194,6 +200,7 @@ export class KernelAndTerminalPanelView extends BaseView {
     this.libroKernelManager = libroKernelManager;
     this.libroSessionManager = libroSessionManager;
     this.terminalManager = terminalManager;
+    this.lspConnectionManager = lspDocumentConnectionManager;
     this.lspManager = lspDocumentConnectionManager.languageServerManager;
   }
 

diff --git a/packages/libro-lab/tsconfig.json b/packages/libro-lab/tsconfig.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "es",
-    "declarationDir": "es",
+    "declarationDir": "es"
   },
   "types": ["jest"],
   "exclude": ["node_modules"],
-  "include": ["src"],
+  "include": ["src"]
 }
diff --git a/packages/libro-lsp/src/connection-manager.ts b/packages/libro-lsp/src/connection-manager.ts
@@ -58,14 +58,24 @@ export class DocumentConnectionManager implements ILSPDocumentConnectionManager
 
   private _connections: Map<TLanguageServerId, LSPConnection> = new Map();
 
-  protected disconnectServer(languageServerId: TLanguageServerId): void {
+  disconnectServer(languageServerId: TLanguageServerId): void {
     const connection = this._connections.get(languageServerId);
     if (connection) {
       connection.close();
       this._connections.delete(languageServerId);
+      this.languageServerManager.refreshRunning();
     }
   }
 
+  disconnectAllServers(): void {
+    this.connections.forEach((connection, languageServerId) => {
+      connection.close();
+      this._connections.delete(languageServerId as TLanguageServerId);
+    });
+
+    this.languageServerManager.refreshRunning();
+  }
+
   /**
    * Return (or create and initialize) the WebSocket associated with the language
    */

diff --git a/packages/libro-lsp/src/manager.ts b/packages/libro-lsp/src/manager.ts
@@ -44,16 +44,7 @@ export class LanguageServerManager implements ILanguageServerManager {
   }
 
   async refreshRunning() {
-    // TODO: refreshRunning
-  }
-
-  async shutdownAll() {
-    // TODO: shutdownAll
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  async shutdown(key: string) {
-    // TODO: shutdown
+    this.fetchSessions();
   }
 
   /**

diff --git a/packages/libro-lsp/src/tokens.ts b/packages/libro-lsp/src/tokens.ts
@@ -82,10 +82,6 @@ export type TLanguageId = string;
 // export const ILanguageServerManager = Symbol('ILanguageServerManager');
 
 export interface ILanguageServerManager extends Disposable {
-  shutdownAll: () => Promise<void>;
-
-  shutdown: (key: string) => Promise<void>;
-
   refreshRunning: () => Promise<void>;
 
   /**
@@ -364,6 +360,10 @@ export const ILSPDocumentConnectionManager = Symbol('ILSPDocumentConnectionManag
  * The LSP connection state manager
  */
 export interface ILSPDocumentConnectionManager {
+  disconnectServer: (languageServerId: TLanguageServerId) => void;
+
+  disconnectAllServers: () => void;
+
   /**
    * The mapping of document uri to the  connection to language server.
    */

diff --git a/packages/libro-lsp/tsconfig.json b/packages/libro-lsp/tsconfig.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "es",
-    "declarationDir": "es",
+    "declarationDir": "es"
   },
   "types": ["jest"],
   "exclude": ["node_modules"],
-  "include": ["src"],
+  "include": ["src"]
 }
diff --git a/packages/libro-markdown-cell/tsconfig.json b/packages/libro-markdown-cell/tsconfig.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "es",
-    "declarationDir": "es",
+    "declarationDir": "es"
   },
   "types": ["jest"],
   "exclude": ["node_modules"],
-  "include": ["src"],
+  "include": ["src"]
 }
diff --git a/packages/libro-markdown/tsconfig.json b/packages/libro-markdown/tsconfig.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "es",
-    "declarationDir": "es",
+    "declarationDir": "es"
   },
   "types": ["jest"],
   "exclude": ["node_modules"],
-  "include": ["src"],
+  "include": ["src"]
 }
diff --git a/packages/libro-output/tsconfig.json b/packages/libro-output/tsconfig.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "es",
-    "declarationDir": "es",
+    "declarationDir": "es"
   },
   "types": ["jest"],
   "exclude": ["node_modules"],
-  "include": ["src"],
+  "include": ["src"]
 }
diff --git a/packages/libro-prompt-cell/tsconfig.json b/packages/libro-prompt-cell/tsconfig.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "es",
-    "declarationDir": "es",
+    "declarationDir": "es"
   },
   "types": ["jest"],
   "exclude": ["node_modules"],
-  "include": ["src"],
+  "include": ["src"]
 }