From 2f349db816c71e6ebd34694df9b042de8525f8ca Mon Sep 17 00:00:00 2001
From: RTLCoil <oleg@rtl.co.il>
Date: Mon, 23 Mar 2020 01:17:16 +0200
Subject: [PATCH] Fix normalize_expression when variable is names as a keyword,
 like "$width"

---
 .../com/cloudinary/transformation/BaseExpression.java  |  2 +-
 .../test/java/com/cloudinary/TransformationTest.java   | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/cloudinary-core/src/main/java/com/cloudinary/transformation/BaseExpression.java b/cloudinary-core/src/main/java/com/cloudinary/transformation/BaseExpression.java
index cd5f4433..43415e4d 100644
--- a/cloudinary-core/src/main/java/com/cloudinary/transformation/BaseExpression.java
+++ b/cloudinary-core/src/main/java/com/cloudinary/transformation/BaseExpression.java
@@ -107,7 +107,7 @@ private static Pattern getPattern() {
             sb.append(Pattern.quote(op)).append("|");
         }
         sb.deleteCharAt(sb.length() - 1);
-        sb.append(")(?=[ _])|").append(StringUtils.join(PREDEFINED_VARS.keySet(), "|")).append(")");
+        sb.append(")(?=[ _])|(?<!\\$)(").append(StringUtils.join(PREDEFINED_VARS.keySet(), "|")).append("))");
         pattern = sb.toString();
         return Pattern.compile(pattern);
     }
diff --git a/cloudinary-core/src/test/java/com/cloudinary/TransformationTest.java b/cloudinary-core/src/test/java/com/cloudinary/TransformationTest.java
index 18356791..db7ebd36 100644
--- a/cloudinary-core/src/test/java/com/cloudinary/TransformationTest.java
+++ b/cloudinary-core/src/test/java/com/cloudinary/TransformationTest.java
@@ -218,4 +218,14 @@ public void testShouldSupportPowOperator() {
 
         assertEquals("$small_150,$big_$small_pow_1.5", t.generate());
     }
+
+    @Test
+    public void testShouldNotChangeVariableNamesWhenTheyNamedAfterKeyword() {
+        Transformation t = new Transformation()
+                .variable("$width", 10)
+                .chain()
+                .width("$width + 10 + width");
+
+        assertEquals("$width_10/w_$width_add_10_add_w", t.generate());
+    }
 }
\ No newline at end of file