Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to master #1

Merged
merged 9 commits into from
Oct 25, 2022
Merged

Update to master #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
801984c
Update textwrap to 0.16.0 (#4437)
trink Oct 23, 2022
d8ffa02
Update scala treesitter grammar (#4353)
olynch Oct 24, 2022
45da569
build(deps): bump anyhow from 1.0.65 to 1.0.66 (#4459)
dependabot[bot] Oct 24, 2022
6ea2c54
build(deps): bump futures-util from 0.3.24 to 0.3.25 (#4460)
dependabot[bot] Oct 24, 2022
0938429
build(deps): bump termini from 0.1.2 to 0.1.4 (#4461)
dependabot[bot] Oct 24, 2022
0238559
build(deps): bump serde_json from 1.0.86 to 1.0.87 (#4462)
dependabot[bot] Oct 24, 2022
6aacdaa
build(deps): bump futures-executor from 0.3.24 to 0.3.25 (#4464)
dependabot[bot] Oct 24, 2022
001e4e3
build(deps): bump serde from 1.0.145 to 1.0.147 (#4463)
dependabot[bot] Oct 24, 2022
c47ca33
Render diagnostics in the file picker preview (#4324)
the-mikedavis Oct 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 43 additions & 22 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion helix-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
8 changes: 7 additions & 1 deletion helix-term/src/ui/picker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion languages.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down