kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'helix-editor:master' into pull-diagnostics

Browse source
This commit is contained in:
SofusA 2024-09-14 22:32:59 +02:00 • committed by GitHub
commit 97fa3065f7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 370 additions and 605 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

955
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

2
helix-core/Cargo.toml
View file

@ -57,7 +57,7 @@ textwrap = "0.16.1"
nucleo.workspace = true
parking_lot = "0.12"
globset = "0.4.14"
globset = "0.4.15"
[dev-dependencies]
quickcheck = { version = "1", default-features = false }

4
helix-lsp-types/Cargo.toml
View file

@ -22,8 +22,8 @@ license = "MIT"
[dependencies]
bitflags = "2.6.0"
serde = { version = "1.0.208", features = ["derive"] }
serde_json = "1.0.125"
serde = { version = "1.0.209", features = ["derive"] }
serde_json = "1.0.127"
serde_repr = "0.1"
url = {version = "2.0.0", features = ["serde"]}

1
helix-lsp-types/src/inline_value.rs
View file

@ -132,6 +132,7 @@ pub struct InlineValueEvaluatableExpression {
/// - directly as a text value (class InlineValueText).
/// - as a name to use for a variable lookup (class InlineValueVariableLookup)
/// - as an evaluatable expression (class InlineValueEvaluatableExpression)
///
/// The InlineValue types combines all inline value types into one type.
///
/// @since 3.17.0

4
helix-lsp/Cargo.toml
View file

@ -22,11 +22,11 @@ helix-lsp-types = { path = "../helix-lsp-types" }
anyhow = "1.0"
futures-executor = "0.3"
futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
globset = "0.4.14"
globset = "0.4.15"
log = "0.4"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
tokio = { version = "1.39", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
tokio = { version = "1.40", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
tokio-stream = "0.1.15"
parking_lot = "0.12.3"
arc-swap = "1"

4
helix-term/Cargo.toml
View file

@ -69,8 +69,8 @@ serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] }
# ripgrep for global search
grep-regex = "0.1.12"
grep-searcher = "0.1.13"
grep-regex = "0.1.13"
grep-searcher = "0.1.14"
[target.'cfg(not(windows))'.dependencies] # https://github.com/vorner/signal-hook/issues/100
signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }

2
helix-vcs/Cargo.toml
View file

@ -19,7 +19,7 @@ tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "p
parking_lot = "0.12"
arc-swap = { version = "1.7.1" }
gix = { version = "0.64.0", features = ["attributes", "status"], default-features = false, optional = true }
gix = { version = "0.66.0", features = ["attributes", "status"], default-features = false, optional = true }
imara-diff = "0.1.7"
anyhow = "1"

3
runtime/themes/naysayer.toml
View file

@ -14,7 +14,8 @@
"ui.virtual" = "indent"
"ui.virtual.ruler" = { bg = "line-fg" }
"ui.cursor.match" = { bg = "cyan" }
"ui.cursor" = { bg = "white" }
"ui.cursor" = { bg = "#777777" }
"ui.cursor.primary" = { bg = "white" }
"ui.debug" = { fg = "orange" }
"ui.highlight.frameline" = { bg = "#da8581" }
"ui.help" = { fg = "text", bg = "bg" }