bugfix: expr: make index rule non-atomic (#511)

woodruffw · Feb 3, 2025 · a2f7a58 · a2f7a58
1 parent ef08ccc
commit a2f7a58
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -13,6 +13,8 @@ of `zizmor`.
 
 * Fixed a bug where `zizmor` would fail to parse composite actions with
   inputs/outputs that are missing descriptions (#502)
+* Expressions that contain indices with non-semantic whitespace are now parsed
+  correctly (#511)
 
 ## v1.3.0
 

diff --git a/src/expr/expr.pest b/src/expr/expr.pest
@@ -73,7 +73,7 @@ null = { "null" }
 context    = ${ (function_call | identifier) ~ (("." ~ (identifier | star)) | index)* }
 star       =  { "*" }
 identifier = @{ (ASCII_ALPHA | "_" | "-") ~ (ASCII_ALPHANUMERIC | "_" | "-")* }
-index      =  { ("[" ~ (or_expr | star) ~ "]") }
+index      = !{ ("[" ~ (or_expr | star) ~ "]") }
 
 /// Function calls
 function_call = !{ identifier ~ "(" ~ (or_expr ~ ("," ~ or_expr)*)? ~ ")" }
diff --git a/src/expr/mod.rs b/src/expr/mod.rs
@@ -527,6 +527,10 @@ mod tests {
             "foo()[0]",
             "fromJson(steps.runs.outputs.data).workflow_runs[0].id",
             multiline,
+            "'a' == 'b' && 'c' || 'd'",
+            "github.event['a']",
+            "github.event['a' == 'b']",
+            "github.event['a' == 'b' && 'c' || 'd']",
         ];
 
         for case in cases {