mirror of
https://github.com/helix-editor/helix.git
synced 2025-10-06 00:13:28 +02:00
Compare commits
5 Commits
filesentry
...
dependabot
Author | SHA1 | Date | |
---|---|---|---|
|
f4b51c005f | ||
|
02fe437622 | ||
|
e88e48f41c | ||
|
fc53af9f4e | ||
|
3e5bb392fa |
21
Cargo.lock
generated
21
Cargo.lock
generated
@@ -150,9 +150,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.2.27"
|
||||
version = "1.2.29"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc"
|
||||
checksum = "5c1599538de2394445747c8cf7935946e3cc27e9625f889d979bfb2aaf569362"
|
||||
dependencies = [
|
||||
"shlex",
|
||||
]
|
||||
@@ -1878,6 +1878,17 @@ version = "2.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
|
||||
|
||||
[[package]]
|
||||
name = "io-uring"
|
||||
version = "0.7.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cfg-if",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "is-docker"
|
||||
version = "0.2.0"
|
||||
@@ -2733,17 +2744,19 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
|
||||
|
||||
[[package]]
|
||||
name = "tokio"
|
||||
version = "1.45.1"
|
||||
version = "1.46.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779"
|
||||
checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17"
|
||||
dependencies = [
|
||||
"backtrace",
|
||||
"bytes",
|
||||
"io-uring",
|
||||
"libc",
|
||||
"mio",
|
||||
"parking_lot",
|
||||
"pin-project-lite",
|
||||
"signal-hook-registry",
|
||||
"slab",
|
||||
"socket2",
|
||||
"tokio-macros",
|
||||
"windows-sys 0.52.0",
|
||||
|
@@ -40,7 +40,7 @@
|
||||
| dart | ✓ | ✓ | ✓ | `dart` |
|
||||
| dbml | ✓ | | | |
|
||||
| debian | ✓ | | | |
|
||||
| devicetree | ✓ | | | |
|
||||
| devicetree | ✓ | | | `dts-lsp` |
|
||||
| dhall | ✓ | ✓ | | `dhall-lsp-server` |
|
||||
| diff | ✓ | | | |
|
||||
| djot | ✓ | | | |
|
||||
@@ -228,6 +228,7 @@
|
||||
| svelte | ✓ | | ✓ | `svelteserver` |
|
||||
| sway | ✓ | ✓ | ✓ | `forc` |
|
||||
| swift | ✓ | ✓ | | `sourcekit-lsp` |
|
||||
| systemd | ✓ | | | `systemd-lsp` |
|
||||
| t32 | ✓ | | | |
|
||||
| tablegen | ✓ | ✓ | ✓ | |
|
||||
| tact | ✓ | ✓ | ✓ | |
|
||||
|
@@ -25,7 +25,7 @@ globset = "0.4.16"
|
||||
log = "0.4"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
tokio = { version = "1.45", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
|
||||
tokio = { version = "1.46", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
|
||||
tokio-stream.workspace = true
|
||||
parking_lot.workspace = true
|
||||
arc-swap = "1"
|
||||
|
@@ -3727,10 +3727,12 @@ fn open(cx: &mut Context, open: Open, comment_continuation: CommentContinuation)
|
||||
.unwrap_or_default();
|
||||
for i in 0..count {
|
||||
// pos -> beginning of reference line,
|
||||
// + (i * (1+indent_len + comment_len)) -> beginning of i'th line from pos (possibly including comment token)
|
||||
// + (i * (line_ending_len + indent_len + comment_len)) -> beginning of i'th line from pos (possibly including comment token)
|
||||
// + indent_len + comment_len -> -> indent for i'th line
|
||||
ranges.push(Range::point(
|
||||
pos + (i * (1 + indent_len + comment_len)) + indent_len + comment_len,
|
||||
pos + (i * (doc.line_ending.len_chars() + indent_len + comment_len))
|
||||
+ indent_len
|
||||
+ comment_len,
|
||||
));
|
||||
}
|
||||
|
||||
|
@@ -35,6 +35,7 @@ dhall-lsp-server = { command = "dhall-lsp-server" }
|
||||
docker-langserver = { command = "docker-langserver", args = ["--stdio"] }
|
||||
docker-compose-langserver = { command = "docker-compose-langserver", args = ["--stdio"]}
|
||||
dot-language-server = { command = "dot-language-server", args = ["--stdio"] }
|
||||
dts-lsp = { command = "dts-lsp" }
|
||||
earthlyls = { command = "earthlyls" }
|
||||
elixir-ls = { command = "elixir-ls", config = { elixirLS.dialyzerEnabled = false } }
|
||||
elm-language-server = { command = "elm-language-server" }
|
||||
@@ -110,6 +111,7 @@ ruby-lsp = { command = "ruby-lsp" }
|
||||
serve-d = { command = "serve-d" }
|
||||
slangd = { command = "slangd" }
|
||||
slint-lsp = { command = "slint-lsp", args = [] }
|
||||
systemd-lsp = { command = "systemd-lsp" }
|
||||
solargraph = { command = "solargraph", args = ["stdio"] }
|
||||
solc = { command = "solc", args = ["--lsp"] }
|
||||
sourcekit-lsp = { command = "sourcekit-lsp" }
|
||||
@@ -2319,6 +2321,7 @@ file-types = ["dts", "dtsi"]
|
||||
comment-token = "//"
|
||||
block-comment-tokens = { start = "/*", end = "*/" }
|
||||
indent = { tab-width = 4, unit = "\t" }
|
||||
language-servers = [ "dts-lsp" ]
|
||||
|
||||
[[grammar]]
|
||||
name = "devicetree"
|
||||
@@ -2922,6 +2925,7 @@ scope = "source.dtd"
|
||||
injection-regex = "dtd"
|
||||
file-types = ["dtd", "ent"]
|
||||
indent = {tab-width = 2, unit = " "}
|
||||
block-comment-tokens = { start = "<!--", end = "-->" }
|
||||
|
||||
[language.auto-pairs]
|
||||
'(' = ')'
|
||||
@@ -2965,15 +2969,12 @@ indent = { tab-width = 4, unit = "\t" }
|
||||
grammar = "bash"
|
||||
|
||||
[[language]]
|
||||
name = "ini"
|
||||
name = "systemd"
|
||||
scope = "source.ini"
|
||||
file-types = [
|
||||
"ini",
|
||||
# Systemd unit files
|
||||
"service",
|
||||
"automount",
|
||||
"desktop",
|
||||
{ glob = "mimeapps.list" },
|
||||
"device",
|
||||
"mount",
|
||||
"nspawn",
|
||||
@@ -2985,6 +2986,19 @@ file-types = [
|
||||
"target",
|
||||
"timer",
|
||||
{ glob = "systemd/**/*.conf" },
|
||||
]
|
||||
injection-regex = "systemd"
|
||||
comment-token = "#"
|
||||
grammar = "ini"
|
||||
language-servers = ["systemd-lsp"]
|
||||
|
||||
[[language]]
|
||||
name = "ini"
|
||||
scope = "source.ini"
|
||||
file-types = [
|
||||
"ini",
|
||||
"desktop",
|
||||
{ glob = "mimeapps.list" },
|
||||
# Podman quadlets
|
||||
"container",
|
||||
"volume",
|
||||
|
@@ -12,4 +12,4 @@
|
||||
|
||||
(setting
|
||||
(setting_name) @variable.other.member
|
||||
(setting_value) @string)
|
||||
((setting_value) @string)?)
|
||||
|
1
runtime/queries/systemd/highlights.scm
Normal file
1
runtime/queries/systemd/highlights.scm
Normal file
@@ -0,0 +1 @@
|
||||
; inherits: ini
|
@@ -45,7 +45,7 @@
|
||||
"ui.virtual.inlay-hint" = { fg = "subtle" }
|
||||
|
||||
"ui.menu" = { fg = "subtle", bg = "surface" }
|
||||
"ui.menu.selected" = { fg = "text" }
|
||||
"ui.menu.selected" = { fg = "text", bg = "overlay" }
|
||||
"ui.menu.scroll" = { fg = "muted", bg = "highlight_med" }
|
||||
|
||||
"ui.selection" = { bg = "overlay" }
|
||||
|
Reference in New Issue
Block a user