formula parser fixes

2026-07-01 08:26:04 +00:00 · 2023-03-31 22:42:44 +03:00
parent 828d8da741
commit 28d1c052d2
2 changed files with 109 additions and 1 deletions
--- a/application/Espo/Core/Formula/Parser.php
+++ b/application/Espo/Core/Formula/Parser.php
@@ -298,6 +298,11 @@ class Parser
                !$lastStatement->isEndedWithSemicolon()
            ) {
                array_pop($statementList);
+            } else if (
+                $lastStatement instanceof StatementRef &&
+                !$lastStatement->isEndedWithSemicolon()
+            ) {
+                $lastStatement->setEnd(strlen($string));
            }
        }

@@ -395,7 +400,10 @@ class Parser
        }

        if (
-            $parenthesisCounter === 0 &&
+            (
+                $parenthesisCounter === 0 ||
+                $parenthesisCounter === 1 && $char === '('
+            ) &&
            $braceCounter === 0
        ) {
            if ($isLineComment || $isComment) {