use specific conf.d names, add extra conf.d config reader for language_servers

Author: bollwyvl

.github/workflows/job.test.yml

@@ -429,5 +429,7 @@ jobs:
           set -eux
           jupyter labextension list
           jupyter server extension list
+          jupyter serverextension list
           jupyter labextension list 2>&1 | grep -ie "jupyterlab-lsp.*enabled.*ok" -
           jupyter server extension list 2>&1 | grep -ie "jupyter_lsp.*enabled" -
+          jupyter serverextension list 2>&1 | grep -ie "jupyter_lsp.*enabled" -

python_packages/jupyter_lsp/jupyter_lsp/etc/jupyter_server_config.json renamed to python_packages/jupyter_lsp/jupyter_lsp/etc/jupyter-lsp-jupyter-server.json

@@ -5,6 +5,8 @@
 from typing import Dict, Text, Tuple
 
 import entrypoints
+from jupyter_core.paths import jupyter_config_path
+from jupyter_server.services.config import ConfigManager
 from jupyter_server.transutils import _
 from traitlets import Bool
 from traitlets import Dict as Dict_
@@ -32,6 +34,11 @@
 class LanguageServerManager(LanguageServerManagerAPI):
     """Manage language servers"""
 
+    conf_d_language_servers = Schema(
+        validator=LANGUAGE_SERVER_SPEC_MAP,
+        help=_("extra language server specs, keyed by implementation, from conf.d"),
+    )  # type: KeyedLanguageServerSpecs
+
     language_servers = Schema(
         validator=LANGUAGE_SERVER_SPEC_MAP,
         help=_("a dict of language server specs, keyed by implementation"),
@@ -72,6 +79,21 @@ def _default_language_servers(self):
     def _default_virtual_documents_dir(self):
         return os.getenv("JP_LSP_VIRTUAL_DIR", ".virtual_documents")
 
+    @default("conf_d_language_servers")
+    def _default_conf_d_language_servers(self):
+        language_servers = {}  # type: KeyedLanguageServerSpecs
+
+        manager = ConfigManager(read_config_path=jupyter_config_path())
+
+        for app in ["_", "_notebook_", "_server_"]:
+            language_servers.update(
+                **manager.get(f"jupyter{app}config")
+                .get(self.__class__.__name__, {})
+                .get("language_servers", {})
+            )
+
+        return language_servers
+
     def __init__(self, **kwargs):
         """Before starting, perform all necessary configuration"""
         super().__init__(**kwargs)
@@ -87,6 +109,7 @@ def init_language_servers(self) -> None:
 
         # copy the language servers before anybody monkeys with them
         language_servers_from_config = dict(self.language_servers)
+        language_servers_from_config.update(self.conf_d_language_servers)
 
         if self.autodetect:
             language_servers.update(self._autodetect_language_servers())

python_packages/jupyter_lsp/jupyter_lsp/etc/jupyter_notebook_config.json renamed to python_packages/jupyter_lsp/jupyter_lsp/etc/jupyter-lsp-notebook.json

@@ -15,11 +15,11 @@
     data_files=[
         (
             "etc/jupyter/jupyter_server_config.d",
-            ["jupyter_lsp/etc/jupyter_server_config.json"],
+            ["jupyter_lsp/etc/jupyter-lsp-jupyter-server.json"],
         ),
         (
             "etc/jupyter/jupyter_notebook_config.d",
-            ["jupyter_lsp/etc/jupyter_notebook_config.json"],
+            ["jupyter_lsp/etc/jupyter-lsp-notebook.json"],
         ),
     ],
 )

python_packages/jupyter_lsp/jupyter_lsp/manager.py

@@ -20,6 +20,9 @@ max-line-length = 88
 [mypy-traitlets.*]
 ignore_missing_imports = True
 
+[mypy-jupyter_core.*]
+ignore_missing_imports = True
+
 [mypy-jupyter_server]
 ignore_missing_imports = True