Merge pull request #12466 from kiselev-dv/fix/expression-issue-12455

Adjust regexp state on string replace, add test case

Author: ggetz

CHANGES.md

@@ -1245,6 +1245,7 @@ try {
 - Fixed an incorrect model matrix computation for `i3dm` tilesets that are loaded using `ModelExperimental`. [#10302](https://github.com/CesiumGS/cesium/pull/10302)
 - Fixed race condition during billboard clamping when the height reference changes. [#10191](https://github.com/CesiumGS/cesium/issues/10191)
 - Fixed ability to run `test` and other support tasks from within the release zip file. [#10311](https://github.com/CesiumGS/cesium/pull/10311)
+- Fixed `Expression` multi-variable substitution. [#12455](https://github.com/CesiumGS/cesium/issues/12455)
 
 ## 1.92 - 2022-04-01
 

CONTRIBUTORS.md

@@ -94,7 +94,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
 - [Camptocamp SA](https://www.camptocamp.com/)
   - [Frédéric Junod](https://github.com/fredj)
   - [Guillaume Beraudo](https://github.com/gberaudo)
-- [EndPoint](https://www.endpoint.com/)
+- [EndPointDev](https://www.endpointdev.com/)
   - [Dmitry Kiselev](https://github.com/kiselev-dv)
 - [Safe Software](https://www.safe.com)
   - [Joel Depooter](https://github.com/JDepooter)

packages/engine/Source/Scene/Expression.js

@@ -1225,6 +1225,7 @@ Node.prototype._evaluateVariableString = function (feature) {
       property = "";
     }
     result = result.replace(placeholder, property);
+    variableRegex.lastIndex += property.length - placeholder.length;
     match = variableRegex.exec(result);
   }
   return result;

packages/engine/Specs/Scene/ExpressionSpec.js

@@ -84,6 +84,9 @@ describe("Scene/Expression", function () {
     expression = new Expression("'replace ${string} multiple ${height}'");
     expect(expression.evaluate(feature)).toEqual("replace hello multiple 10");
 
+    expression = new Expression("'replace ${height} ${string}'");
+    expect(expression.evaluate(feature)).toEqual("replace 10 hello");
+
     expression = new Expression('"replace ${string}"');
     expect(expression.evaluate(feature)).toEqual("replace hello");