Merge pull request #44 from cgay/registry

Make OPEN_DYLAN_USER_REGISTRIES customizable

Author: cgay

.github/workflows/build-and-test.yml

@@ -28,9 +28,6 @@ jobs:
 
       - name: Install Open Dylan
         uses: dylan-lang/install-opendylan@v3
-        with:
-          version: 2024.1
-          tag: v2024.1.0
 
       - name: Install dependencies
         run: dylan update

documentation/source/index.rst

@@ -79,7 +79,7 @@ which must be on your :envvar:`PATH`.
 When you open each new file in your editor the LSP client may try to start a
 new project if the file isn't part of the same :program:`deft` workspace
 directory. If you want the client to use just one project, use a `multi-package
-workspace <https://opendylan.org/package/deft/index.html#workspaces>`_.
+workspace <https://package.opendylan.org/deft/index.html#workspaces>`_.
 
 .. note:: Always run ``deft update`` and ``deft build -a`` in your workspace
           **before** starting the LSP server, or :program:`dylan-lsp-server`
@@ -130,6 +130,7 @@ The emacs client has a customization group "lsp-dylan" which is a member of the
 * ``lsp-dylan-extra-command-line-options``
 * ``lsp-dylan-log-pathname``
 * ``lsp-dylan-open-dylan-release``
+* ``lsp-dylan-open-dylan-registry``
 
 These are documented in the customization interface within emacs. Use ``M-x
 customize-group`` ``lsp-dylan`` to customize these variables.

lsp-dylan.el

@@ -16,26 +16,35 @@
 
 (defcustom lsp-dylan-exe-pathname "dylan-lsp-server"
   "Name of the dylan-lsp-server executable.
-   Must be an absolute pathname or the binary must be on your PATH."
+Must be an absolute pathname or the binary must be on your PATH."
   :type 'string)
 
 (defcustom lsp-dylan-extra-command-line-options '()
   "List of command-line options to pass to dylan-lsp-server.
-   Possible values are \"--debug-opendylan\" and \"--debug-server\".
-   See `dylan-lsp-server --help` for more information on these options."
+Possible values are \"--debug-opendylan\" and \"--debug-server\".
+See `dylan-lsp-server --help` for more information on these options."
   :type '(repeat string))
 
 (defcustom lsp-dylan-log-pathname nil
   "Pathname of the server's log file.
-   The default is dylan-lsp-server.log, in the server's working directory,
-   which is normally the directory of the Dylan source file where the LSP
-   client was started."
+The default is dylan-lsp-server.log, in the server's working directory,
+which is normally the directory of the Dylan source file where the LSP
+client was started."
   :type 'file)
 
 (defcustom lsp-dylan-open-dylan-release nil
   "Absolute pathname of the Open Dylan installation directory.
-   If nil, infer the installation directory from the location
-   of the dylan-compiler binary, which must be on the path."
+If nil, infer the installation directory from the location
+of the dylan-compiler binary, which must be on the path."
+  :type '(choice string (const nil)))
+
+(defcustom lsp-dylan-open-dylan-registry nil
+  "Absolute pathname of the Open Dylan registry directory.  If you expect to
+modify Open Dylan libraries point this at the registry in your Git checkout so
+that lsp-dylan will use the sources you are working on.
+
+If nil, the registry in `lsp-dylan-open-dylan-release'/sources/registry is
+used."
   :type '(choice string (const nil)))
 
 (add-to-list 'lsp-language-id-configuration '(dylan-mode . "dylan"))
@@ -65,7 +74,8 @@
                           (getenv "OPEN_DYLAN_RELEASE_INSTALL")
                           (lsp-dylan--infer-install-dir)
                           (error "Can't find Open Dylan install directory")))
-         (registry-dir (or (getenv "OPEN_DYLAN_USER_REGISTRIES")
+         (registry-dir (or lsp-dylan-open-dylan-registry
+                           (getenv "OPEN_DYLAN_USER_REGISTRIES")
                            (expand-file-name "sources/registry"
                                              (file-name-as-directory install-dir)))))
     (list