Merge branch 'master' into sankey-diagram

ishubin · Jan 31, 2025 · 393ade8 · 393ade8
2 parents 4b356a5 + dabaf0b
commit 393ade8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/ui/templater/ast.js b/src/ui/templater/ast.js
@@ -11,8 +11,8 @@ const operatorPrecedences = [
     '*',
     '/',
     '%',
-    '+',
     '-',
+    '+',
     '<<',
     '>>',
     '&',

diff --git a/test/templater/ast.spec.js b/test/templater/ast.spec.js
@@ -9,8 +9,9 @@ import { List } from '../../src/ui/templater/list';
 describe('templater ast parser', () => {
     it('should parse various expressions', () => {
         [
-            ['2-5 + qwe', '(2 - (5 + qwe))'],
-            ['2 * 8 + 1 - 4 *4 ', '(((2 * 8) + 1) - (4 * 4))'],
+            ['2 - 5 - k + x * w', '(((2 - 5) - k) + (x * w))'],
+            ['2-5 + qwe', '((2 - 5) + qwe)'],
+            ['2 * 8 + 1 - 4 *4 ', '((2 * 8) + (1 - (4 * 4)))'],
             ['1 + (x - 4) * 3', '(1 + ((x - 4) * 3))'],
             ['x < 5', '(x < 5)'],
             ['x + 1 < 5 - y', '((x + 1) < (5 - y))'],
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,8 +11,8 @@ const operatorPrecedences = [ @@
         '*',
         '/',
         '%',
-        '+',
         '-',
+        '+',
         '<<',
         '>>',
         '&',
@@ Expand Down @@