From 6bfd001b485dd27ba5fe3d22d27f021596dce4b8 Mon Sep 17 00:00:00 2001 From: voroskoi <60064214+voroskoi@users.noreply.github.com> Date: Fri, 14 Jan 2022 15:29:24 +0100 Subject: [PATCH] Update zig tree-sitter (#1501) use latest upstream version move comptime from @keyword.function to @keyword.directive use AssignOp enhance indents --- helix-syntax/languages/tree-sitter-zig | 2 +- runtime/queries/zig/highlights.scm | 5 ++--- runtime/queries/zig/indents.toml | 3 +++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/helix-syntax/languages/tree-sitter-zig b/helix-syntax/languages/tree-sitter-zig index 1f27fd1df..93331b8bd 160000 --- a/helix-syntax/languages/tree-sitter-zig +++ b/helix-syntax/languages/tree-sitter-zig @@ -1 +1 @@ -Subproject commit 1f27fd1dfe7f352408f01b4894c7825f3a1d6c47 +Subproject commit 93331b8bd8b4ebee2b575490b2758f16ad4e9f30 diff --git a/runtime/queries/zig/highlights.scm b/runtime/queries/zig/highlights.scm index 34dbeacd0..62c99acc1 100644 --- a/runtime/queries/zig/highlights.scm +++ b/runtime/queries/zig/highlights.scm @@ -144,7 +144,6 @@ field_constant: (IDENTIFIER) @constant ; VarDecl [ - "comptime" "threadlocal" "fn" ] @keyword.function @@ -178,6 +177,7 @@ field_constant: (IDENTIFIER) @constant ; PrecProc [ + "comptime" "inline" "noinline" "asm" @@ -195,15 +195,14 @@ field_constant: (IDENTIFIER) @constant (BitwiseOp) (BitShiftOp) (AdditionOp) + (AssignOp) (MultiplyOp) (PrefixOp) "*" "**" "->" - "=>" ".?" ".*" - "=" "?" ] @operator diff --git a/runtime/queries/zig/indents.toml b/runtime/queries/zig/indents.toml index 88f88e16b..36ba8e558 100644 --- a/runtime/queries/zig/indents.toml +++ b/runtime/queries/zig/indents.toml @@ -3,6 +3,9 @@ indent = [ "BlockExpr", "ContainerDecl", "SwitchExpr", + "AssignExpr", + "ErrorUnionExpr", + "Statement", "InitList" ]