From 02c404e6e9e9d538737794ae81a1800958a90d79 Mon Sep 17 00:00:00 2001
From: Carl Gay <carlgay@gmail.com>
Date: Wed, 24 Apr 2024 11:57:24 -0400
Subject: [PATCH 1/2] Include dylan-lsp-server binary in releases

---
 .gitmodules                                   |  3 +++
 Makefile.in                                   |  2 +-
 documentation/release-notes/source/2024.2.rst | 12 ++++++++++++
 sources/app/lsp-dylan                         |  1 +
 sources/registry/generic/dylan-lsp-server     |  1 +
 sources/registry/generic/lsp-dylan            |  1 +
 sources/registry/generic/lsp-dylan-test-suite |  1 +
 7 files changed, 20 insertions(+), 1 deletion(-)
 create mode 160000 sources/app/lsp-dylan
 create mode 100644 sources/registry/generic/dylan-lsp-server
 create mode 100644 sources/registry/generic/lsp-dylan
 create mode 100644 sources/registry/generic/lsp-dylan-test-suite

diff --git a/.gitmodules b/.gitmodules
index e8f85fc37..9544b776f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -37,3 +37,6 @@
 [submodule "sources/app/deft"]
 	path = sources/app/deft
 	url = https://github.com/dylan-lang/deft
+[submodule "sources/app/lsp-dylan"]
+	path = sources/app/lsp-dylan
+	url = https://github.com/dylan-lang/lsp-dylan
diff --git a/Makefile.in b/Makefile.in
index d83e7b3d1..11fb1b16d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -191,7 +191,7 @@ BOOTSTRAP_3_ROOT = $(abs_builddir)/Bootstrap.3
 BOOTSTRAP_3_LIBRARIES = \
 	dylan-compiler dylan-environment parser-compiler dswank
 BOOTSTRAP_3_STATICS = \
-	deft-app
+	deft-app dylan-lsp-server
 
 BOOTSTRAP_3_COMPILER = \
         $(BOOTSTRAP_2_ROOT)/bin/dylan-compiler \
diff --git a/documentation/release-notes/source/2024.2.rst b/documentation/release-notes/source/2024.2.rst
index 78bde46b4..fa87319f4 100644
--- a/documentation/release-notes/source/2024.2.rst
+++ b/documentation/release-notes/source/2024.2.rst
@@ -20,6 +20,18 @@ this release.
 Compiler
 ========
 
+Tools
+=====
+
+* A new binary, ``dylan-lsp-server``, is bundled in this release. This is a
+  Language Server Protocol (LSP) implementation for use with VS Code and
+  emacs. It currently supports jump to definition/declaration, compiler
+  warnings, and hover text.
+
+  See the `lsp-server documentation
+  <https://opendylan.org/package/lsp-dylan/index.html>`_ for configuration
+  details.
+
 Library Updates
 ===============
 
diff --git a/sources/app/lsp-dylan b/sources/app/lsp-dylan
new file mode 160000
index 000000000..2ec0802f2
--- /dev/null
+++ b/sources/app/lsp-dylan
@@ -0,0 +1 @@
+Subproject commit 2ec0802f2f998478a81d67718e806449e66bb436
diff --git a/sources/registry/generic/dylan-lsp-server b/sources/registry/generic/dylan-lsp-server
new file mode 100644
index 000000000..e7f504e23
--- /dev/null
+++ b/sources/registry/generic/dylan-lsp-server
@@ -0,0 +1 @@
+abstract://dylan/app/lsp-dylan/sources/server.lid
diff --git a/sources/registry/generic/lsp-dylan b/sources/registry/generic/lsp-dylan
new file mode 100644
index 000000000..0ad733622
--- /dev/null
+++ b/sources/registry/generic/lsp-dylan
@@ -0,0 +1 @@
+abstract://dylan/app/lsp-dylan/sources/lsp-dylan.lid
diff --git a/sources/registry/generic/lsp-dylan-test-suite b/sources/registry/generic/lsp-dylan-test-suite
new file mode 100644
index 000000000..3171d1be3
--- /dev/null
+++ b/sources/registry/generic/lsp-dylan-test-suite
@@ -0,0 +1 @@
+abstract://dylan/app/lsp-dylan/sources/test-suite.lid

From 3fb9c7d6644ae37028510e5e28337f9381757afd Mon Sep 17 00:00:00 2001
From: Carl Gay <carlgay@gmail.com>
Date: Wed, 24 Apr 2024 12:29:09 -0400
Subject: [PATCH 2/2] doc: add release note for dylan -> deft change

---
 documentation/release-notes/source/2024.2.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/documentation/release-notes/source/2024.2.rst b/documentation/release-notes/source/2024.2.rst
index fa87319f4..1d7a4fb9a 100644
--- a/documentation/release-notes/source/2024.2.rst
+++ b/documentation/release-notes/source/2024.2.rst
@@ -32,6 +32,13 @@ Tools
   <https://opendylan.org/package/lsp-dylan/index.html>`_ for configuration
   details.
 
+* The ``dylan`` tool has been renamed to `deft
+  <https://opendylan.org/package/deft/index.html>`_.  This was done primarily
+  because it avoids some awkwardness when having to distinguish between the
+  Dylan language and the ``dylan`` tool. The ``dylan`` binary continues to
+  exist for backward compatibility (for example in GitHub workflows) but it
+  will be removed in a future release.
+
 Library Updates
 ===============