Handle null matches properly

stephenamar-db · stephenamar-db · commit 3212a527274c · 2024-12-19T16:46:05.000-08:00
diff --git a/sjsonnet/src/sjsonnet/StdRegex.scala b/sjsonnet/src/sjsonnet/StdRegex.scala
@@ -17,7 +17,12 @@ object StdRegex {
             returnStr = Val.Str(pos.noOffset, matcher.group(0))
           }
           for (i <- 1 to groupCount) {
-            captures += Val.Str(pos.noOffset, matcher.group(i))
+            val m = matcher.group(i)
+            if (m == null) {
+              captures += Val.Null(pos.noOffset)
+            } else {
+              captures += Val.Str(pos.noOffset, m)
+            }
           }
         }
         val result = captures.result()

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,12 @@ object StdRegex {`
`17`	`17`	`returnStr = Val.Str(pos.noOffset, matcher.group(0))`
`18`	`18`	`}`
`19`	`19`	`for (i <- 1 to groupCount) {`
`20`		`- captures += Val.Str(pos.noOffset, matcher.group(i))`
	`20`	`+ val m = matcher.group(i)`
	`21`	`+ if (m == null) {`
	`22`	`+ captures += Val.Null(pos.noOffset)`
	`23`	`+ } else {`
	`24`	`+ captures += Val.Str(pos.noOffset, m)`
	`25`	`+ }`
`21`	`26`	`}`
`22`	`27`	`}`
`23`	`28`	`val result = captures.result()`