From dec931c3aa5a0f6e1b3660ca24c21210c0544d28 Mon Sep 17 00:00:00 2001 From: Nils <40796807+uchars@users.noreply.github.com> Date: Fri, 28 Apr 2023 13:32:34 +0200 Subject: [PATCH] feat(zig): multiline --- queries/zig/context.scm | 22 ++++++++++++--- test/test.zig | 61 +++++++++++++++++++++-------------------- 2 files changed, 49 insertions(+), 34 deletions(-) diff --git a/queries/zig/context.scm b/queries/zig/context.scm index 4b64dab8..4bdc17bc 100644 --- a/queries/zig/context.scm +++ b/queries/zig/context.scm @@ -1,18 +1,32 @@ ([ - (LoopStatement) - (LoopExpr) (LoopTypeExpr) - (IfStatement) (IfTypeExpr) (TestDecl) (SwitchExpr) - (SwitchProng) ] @context) (Decl (FnProto (_)) + (Block (_) @context.end) ) @context (VarDecl (ErrorUnionExpr (_)) ) @context + +(IfStatement + (BlockExpr (_) @context.end) +) @context + +(LoopStatement + (_ (BlockExpr (_) @context.end)) +) @context + +(LoopExpr + (_ (Block (_) @context.end)) +) @context + +(SwitchProng + (AssignExpr) @context.end +) @context + diff --git a/test/test.zig b/test/test.zig index f18ffa18..3f6c6409 100644 --- a/test/test.zig +++ b/test/test.zig @@ -1,15 +1,18 @@ test "stuff" { - while (i < 3) { + while (i < 3 && + j > 4) { i += 1; - if (i == 2) { + if (i == 2 + && j == 3) { // stuff - } else if (i == 3) { + } else if (i == 3 && + j == 4) { // stuff @@ -48,19 +51,13 @@ test "stuff" { const items = [_]i32 { 4, 5, 3, 4, 0 }; - for (items) |value| { - - - - - - - sum += value; - } + // counting for loop + for var sum: i32 = 0; - const result = for (items) |value| { + const result = for ( + items) |value| { if (value != null) { sum += value.?; } @@ -109,9 +106,23 @@ const Stuff = struct { d: i8, } -fn bar(a: i8) { +fn bar(a: i8, +b: i8) { + switch (a) { + 42, + 1 => { + + } + } const b = switch (a) { - 101 => blk: { + 42, + 1 => { + + + }, + + 101, + 102=> blk: { @@ -128,7 +139,9 @@ fn bar(a: i8) { }; } -fn foo(a: i8, b:i8) Stuff { +fn foo(a: i8, + +b:i8) Stuff { var p = Stuff { a: 1, @@ -146,22 +159,10 @@ fn foo(a: i8, b:i8) Stuff { }; return Stuff { - a: a, - - - - - b: b, - - - - - c: 0, - - + .a = a, - d: 0, + .b = b, };