Merge branch 'helix-editor:master' into file_watcher

.github/workflows/build.yml

@@ -9,7 +9,7 @@ on:
     - cron: "00 01 * * *"
 
 env:
-  MSRV: "1.76"
+  MSRV: "1.82"
   # This key can be changed to bust the cache of tree-sitter grammars.
   GRAMMAR_CACHE_VERSION: ""
 

Cargo.toml

@@ -56,4 +56,4 @@ categories = ["editor"]
 repository = "https://github.com/helix-editor/helix"
 homepage = "https://helix-editor.com"
 license = "MPL-2.0"
-rust-version = "1.76"
+rust-version = "1.82"

helix-event/src/test.rs

@@ -56,6 +56,7 @@ fn smoke_test() {
 }
 
 #[test]
+#[allow(dead_code)]
 fn dynamic() {
     events! {
         Event3 {}

helix-lsp-types/src/lib.rs

@@ -2568,9 +2568,9 @@ pub enum Documentation {
 ///
 /// The pair of a language and a value is an equivalent to markdown:
 ///
-/// ```${language}
+/// <pre><code>```${language}
 /// ${value}
-/// ```
+/// ```</code></pre>
 #[derive(Debug, Eq, PartialEq, Clone, Deserialize, Serialize)]
 #[serde(untagged)]
 pub enum MarkedString {

helix-lsp/src/client.rs

@@ -356,7 +356,14 @@ impl Client {
                 capabilities.inlay_hint_provider,
                 Some(OneOf::Left(true) | OneOf::Right(InlayHintServerCapabilities::Options(_)))
             ),
-            LanguageServerFeature::DocumentColors => capabilities.color_provider.is_some(),
+            LanguageServerFeature::DocumentColors => matches!(
+                capabilities.color_provider,
+                Some(
+                    ColorProviderCapability::Simple(true)
+                        | ColorProviderCapability::ColorProvider(_)
+                        | ColorProviderCapability::Options(_)
+                )
+            ),
         }
     }
 

helix-stdx/tests/path.rs

@@ -1,10 +1,6 @@
 #![cfg(windows)]
 
-use std::{
+use std::{env::set_current_dir, error::Error, path::Component};
-    env::set_current_dir,
-    error::Error,
-    path::{Component, Path, PathBuf},
-};
 
 use helix_stdx::path;
 use tempfile::Builder;

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.76.0"
+channel = "1.82.0"
 components = ["rustfmt", "rust-src", "clippy"]