Merge branch 'helix-editor:master' into add-starlight

helix-editor · Nov 15, 2023 · 9178ce3 · 9178ce3
2 parents bb04f6b + 40959bb
commit 9178ce3
Show file tree

Hide file tree

Showing 6 changed files with 153 additions and 162 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
@@ -101,7 +101,8 @@ pub struct LanguageConfiguration {
     pub file_types: Vec<FileType>, // filename extension or ends_with? <Gemfile, rb, etc>
     #[serde(default)]
     pub shebangs: Vec<String>, // interpreter(s) associated with language
-    pub roots: Vec<String>,        // these indicate project roots <.git, Cargo.toml>
+    #[serde(default)]
+    pub roots: Vec<String>, // these indicate project roots <.git, Cargo.toml>
     pub comment_token: Option<String>,
     pub text_width: Option<usize>,
     pub soft_wrap: Option<SoftWrap>,

diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
@@ -25,7 +25,7 @@ lsp-types = { version = "0.94" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
-tokio = { version = "1.33", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
+tokio = { version = "1.34", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
 tokio-stream = "0.1.14"
 which = "4.4"
 parking_lot = "0.12.1"