diff --git a/documentation/source/index.rst b/documentation/source/index.rst index b53d324..bd3dcd8 100644 --- a/documentation/source/index.rst +++ b/documentation/source/index.rst @@ -60,16 +60,15 @@ Usage The LSP server needs to be able to open a project (that is, a Dylan library) associated with the file you're editing when you turn on LSP in your editor. It -assumes you are using a `dylan-tool -`_ workspace and searches for a -project to open as follows: +assumes you are using a `deft `_ workspace +and searches for a project to open as follows: 1. If there is a :file:`workspace.json` file and that file has a `"default-library"` property, the specified library is opened. -2. It uses the :program:`dylan` tool to choose a library defined in the - workspace. This is `generally - `_ +2. It uses :program:`deft` to choose a library defined in the workspace. This + is `generally + `_ the test suite library, if one exists; otherwise it chooses a project arbitrarily. @@ -80,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:`dylan` workspace directory. If you want the client to use just one project, use a `multi-package -workspace `_. +workspace `_. .. note:: Always run ``dylan update`` and ``dylan build -a`` in your workspace **before** starting the LSP server, or :program:`dylan-lsp-server` diff --git a/sources/handlers.dylan b/sources/handlers.dylan index 3de92ef..b8a166a 100644 --- a/sources/handlers.dylan +++ b/sources/handlers.dylan @@ -609,11 +609,11 @@ define function find-project-name let library-name = workspace & ws/workspace-default-library-name(workspace); if (library-name) - log-debug("Found dylan-tool workspace default library name %=", library-name); + log-debug("Found deft workspace default library name %=", library-name); library-name else error("Dylan workspace has no default library; no .lid files created yet?" - " See https://opendylan.org/package/dylan-tool/index.html#workspaces" + " See https://opendylan.org/package/deft/index.html#workspaces" " for how to configure a default project."); end end if diff --git a/sources/library.dylan b/sources/library.dylan index 438f65e..ed01759 100644 --- a/sources/library.dylan +++ b/sources/library.dylan @@ -8,7 +8,7 @@ define library lsp-dylan use dfmc-back-end-implementations; use dfmc-reader; use dylan; - use dylan-tool; + use deft; use environment-commands; use environment-internal-commands; use environment-protocols; diff --git a/sources/misc.dylan b/sources/misc.dylan index 5bfbfd3..6b709f2 100644 --- a/sources/misc.dylan +++ b/sources/misc.dylan @@ -50,10 +50,10 @@ define function invoke-message-handler end function; // Find the workspace root. The "rootUri" LSP parameter takes precedence over -// the deprecated "rootPath" LSP parameter. We first look for a `dylan-tool` +// the deprecated "rootPath" LSP parameter. We first look for a `deft` // workspace root containing the file and then fall back to the nearest // directory containing a `registry` directory. This should work for -// `dylan-tool` users and others equally well. +// `deft` users and others equally well. define function find-workspace-root (root-uri, root-path) => (root :: false-or()) let directory