Merge branch 'helix-editor:master' into master

Author: midnightexigent

Cargo.lock

@@ -40,7 +40,7 @@ encoding_rs = "0.8"
 
 chrono = { version = "0.4", default-features = false, features = ["alloc", "std"] }
 
-etcetera = "0.3"
+etcetera = "0.4"
 textwrap = "0.15.0"
 
 [dev-dependencies]

helix-core/Cargo.toml

@@ -13,7 +13,7 @@ homepage = "https://helix-editor.com"
 anyhow = "1"
 serde = { version = "1.0", features = ["derive"] }
 toml = "0.5"
-etcetera = "0.3"
+etcetera = "0.4"
 tree-sitter = "0.20"
 once_cell = "1.9"
 

helix-loader/Cargo.toml

@@ -215,20 +215,21 @@ impl Transport {
             }
         };
 
-        let tx = self
-            .pending_requests
-            .lock()
-            .await
-            .remove(&id)
-            .expect("pending_request with id not found!");
-
-        match tx.send(result).await {
-            Ok(_) => (),
-            Err(_) => error!(
-                "Tried sending response into a closed channel (id={:?}), original request likely timed out",
-                id
-            ),
-        };
+        if let Some(tx) = self.pending_requests.lock().await.remove(&id) {
+            match tx.send(result).await {
+                Ok(_) => (),
+                Err(_) => error!(
+                    "Tried sending response into a closed channel (id={:?}), original request likely timed out",
+                    id
+                ),
+            };
+        } else {
+            log::error!(
+                "Discarding Language Server response without a request (id={:?}) {:?}",
+                id,
+                result
+            );
+        }
 
         Ok(())
     }

helix-lsp/src/transport.rs

@@ -1284,7 +1284,7 @@ injection-regex = "hare"
 file-types = ["ha"]
 roots = []
 comment-token = "//"
-indent = { tab-width = 4, unit = "\t" }
+indent = { tab-width = 8, unit = "\t" }
 
 [[grammar]]
 name = "hare"