From 0842092267cdf80a10c12ac53fd5009d45fd317a Mon Sep 17 00:00:00 2001
From: Will Lillis <wlillis@umass.edu>
Date: Thu, 25 Jan 2024 17:39:06 -0500
Subject: [PATCH 1/2] docs: add asm-lsp (#2400)

---
 docs/src/language_servers.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/docs/src/language_servers.md b/docs/src/language_servers.md
index 00d094a7b..ed17c4abe 100644
--- a/docs/src/language_servers.md
+++ b/docs/src/language_servers.md
@@ -16,6 +16,30 @@ If there are no setup steps for a language server on this page, but a [language
 
 Follow installation instructions on [LSP-angular](https://github.com/sublimelsp/LSP-angular).
 
+## Assembly
+
+1. Install `asm-lsp` via Cargo (see [github:bergercookie/asm-lsp](https://github.com/bergercookie/asm-lsp)):
+
+    ```sh
+    cargo install asm-lsp
+    ```
+
+2. Install the [x86 and x86_64 Assembly](https://packagecontrol.io/packages/x86%20and%20x86_64%20Assembly) package from Package Control.
+
+3. Open `Preferences > Package Settings > LSP > Settings` and add the `"asm-lsp"` client configuration to the `"clients"`:
+
+    ```jsonc
+    {
+        "clients": {
+            "asm-lsp": {
+                "enabled": true,
+                "command": ["asm-lsp"],
+                "selector": "source.asm | source.assembly"
+            }
+        }
+    }
+    ```
+
 ## Bash
 
 Follow installation instructions on [LSP-bash](https://github.com/sublimelsp/LSP-bash).

From e3a03bc75dcf06746e44584eba688a7630ec1508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Ch=C5=82odnicki?= <rchl2k@gmail.com>
Date: Fri, 26 Jan 2024 19:40:41 +0100
Subject: [PATCH 2/2] Fix KeyError exception triggered on closing a window
 (#2401)

---
 plugin/core/windows.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/core/windows.py b/plugin/core/windows.py
index cd1e8b578..1c4cb43f9 100644
--- a/plugin/core/windows.py
+++ b/plugin/core/windows.py
@@ -545,7 +545,7 @@ def listener_for_view(self, view: sublime.View) -> Optional[AbstractViewListener
     def discard(self, window: sublime.Window) -> None:
         wm = self._windows.pop(window.id(), None)
         if wm:
-            wm.destroy()
+            sublime.set_timeout_async(wm.destroy)
 
 
 class RequestTimeTracker: