From a8b0dc9d94ed5729cce0bf85e31835848bfc51e2 Mon Sep 17 00:00:00 2001
From: Fei Chen <43032123+feich-ms@users.noreply.github.com>
Date: Fri, 7 Aug 2020 08:09:51 +0800
Subject: [PATCH] [Port] properly escape slashes in constant strings with
 StringExpression/ValueExpression (#2660)

* escape slashes in constantr strings

* add semicolon

Co-authored-by: Dong Lei <donglei@microsoft.com>
---
 .../expressionProperties/stringExpression.ts  |  2 +-
 .../expressionProperties/valueExpression.ts   |  2 +-
 .../tests/expressionProperty.test.ts          | 20 +++++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/libraries/adaptive-expressions/src/expressionProperties/stringExpression.ts b/libraries/adaptive-expressions/src/expressionProperties/stringExpression.ts
index b9a94e083d..4a32f5757a 100644
--- a/libraries/adaptive-expressions/src/expressionProperties/stringExpression.ts
+++ b/libraries/adaptive-expressions/src/expressionProperties/stringExpression.ts
@@ -50,7 +50,7 @@ export class StringExpression extends ExpressionProperty<string> {
             }
 
             // Initialize value
-            this.expressionText = `=\`${ value }\``;
+            this.expressionText = `=\`${ value.replace(/\\/g, '\\\\') }\``;
             return;
         }
     }
diff --git a/libraries/adaptive-expressions/src/expressionProperties/valueExpression.ts b/libraries/adaptive-expressions/src/expressionProperties/valueExpression.ts
index 81cada6761..d4a9636f9f 100644
--- a/libraries/adaptive-expressions/src/expressionProperties/valueExpression.ts
+++ b/libraries/adaptive-expressions/src/expressionProperties/valueExpression.ts
@@ -44,7 +44,7 @@ export class ValueExpression extends ExpressionProperty<any> {
             }
 
             // keep the string as quoted expression, which will be literal unless string interpolation is used.
-            this.expressionText = `=\`${ value }\``;
+            this.expressionText = `=\`${ value.replace(/\\/g, '\\\\') }\``;
             return;
         }
 
diff --git a/libraries/adaptive-expressions/tests/expressionProperty.test.ts b/libraries/adaptive-expressions/tests/expressionProperty.test.ts
index 5535cb2d88..98046ad18d 100644
--- a/libraries/adaptive-expressions/tests/expressionProperty.test.ts
+++ b/libraries/adaptive-expressions/tests/expressionProperty.test.ts
@@ -161,6 +161,16 @@ describe('expressionProperty tests', () => {
         result = str.getValue(data);
         assert.equal(result, 'joe');
         assert.equal(str.toExpression().toString(), 'test');
+
+        // slashes are the chars
+        str = new StringExpression('c:\\test\\test\\test');
+        result = str.getValue(data);
+        assert.equal(result, 'c:\\test\\test\\test');
+
+        // tabs are the chars
+        str = new StringExpression('c:\test\test\test');
+        result = str.getValue(data);
+        assert.equal(result, 'c:\test\test\test');
     });
 
     it('ValueExpression', () => {
@@ -195,5 +205,15 @@ describe('expressionProperty tests', () => {
         result = val.getValue(data);
         assert.equal(result, undefined);
         assert.equal(val.toExpression().toString(), 'null');
+
+        // slashes are the chars
+        val = new ValueExpression('c:\\test\\test\\test');
+        result = val.getValue(data);
+        assert.equal(result, 'c:\\test\\test\\test');
+
+        // tabs are the chars
+        val = new ValueExpression('c:\test\test\test');
+        result = val.getValue(data);
+        assert.equal(result, 'c:\test\test\test');
     });
 });
\ No newline at end of file