Merge pull request #1 from helix-editor/master

Update to master
grv07 · Oct 25, 2022 · 4fe7eef · 4fe7eef
2 parents ce469ab + c47ca33
commit 4fe7eef
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
@@ -43,7 +43,7 @@ encoding_rs = "0.8"
 chrono = { version = "0.4", default-features = false, features = ["alloc", "std"] }
 
 etcetera = "0.4"
-textwrap = "0.15.1"
+textwrap = "0.16.0"
 
 [dev-dependencies]
 quickcheck = { version = "1", default-features = false }
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
@@ -248,8 +248,14 @@ impl<T: Item + 'static> Component for FilePicker<T> {
 
             let offset = Position::new(first_line, 0);
 
-            let highlights =
+            let mut highlights =
                 EditorView::doc_syntax_highlights(doc, offset, area.height, &cx.editor.theme);
+            for spans in EditorView::doc_diagnostics_highlights(doc, &cx.editor.theme) {
+                if spans.is_empty() {
+                    continue;
+                }
+                highlights = Box::new(helix_core::syntax::merge(highlights, spans));
+            }
             EditorView::render_text_highlights(
                 doc,
                 offset,

diff --git a/languages.toml b/languages.toml
@@ -982,7 +982,7 @@ language-server = { command = "metals" }
 
 [[grammar]]
 name = "scala"
-source = { git = "https://github.com/tree-sitter/tree-sitter-scala", rev = "0a3dd53a7fc4b352a538397d054380aaa28be54c" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-scala", rev = "140c96cf398693189d4e50f76d19ddfcd8a018f8" }
 
 [[language]]
 name = "dockerfile"