Update the regex in escaping

ballerina-platform · Oct 25, 2023 · 34b6f71 · 34b6f71
1 parent b1c4072
commit 34b6f71
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangNodeBuilder.java b/...ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangNodeBuilder.java
@@ -5478,7 +5478,8 @@ private BLangNode createActionOrExpression(Node actionOrExpression) {
             BLangSimpleVarRef bLVarRef = (BLangSimpleVarRef) TreeBuilder.createSimpleVariableReferenceNode();
             bLVarRef.pos = getPosition(actionOrExpression);
             bLVarRef.pkgAlias = this.createIdentifier(nameReference[0].getPosition(), nameReference[0].getValue());
-            bLVarRef.variableName = this.createIdentifier(nameReference[1].getPosition(), nameReference[1].getValue());
+            bLVarRef.variableName =
+                    this.createIdentifier(nameReference[1].getPosition(), nameReference[1].originalValue);
             return bLVarRef;
         } else if (actionOrExpression.kind() == SyntaxKind.BRACED_EXPRESSION) {
             BLangGroupExpr group = (BLangGroupExpr) TreeBuilder.createGroupExpressionNode();

diff --git a/misc/identifier-util/src/main/java/io/ballerina/identifier/Utils.java b/misc/identifier-util/src/main/java/io/ballerina/identifier/Utils.java
@@ -88,7 +88,7 @@ private static String encodeIdentifier(String identifier) {
      * @return a new unescaped {@code String}, {@code null} if null string input
      */
     public static String unescapeJava(String str) {
-        String result = str.replaceAll("\\\\(\\d)", "$1");
+       String result = str.replaceAll("(?<!\\\\)\\\\(\\d)", "$1");
         return StringEscapeUtils.unescapeJava(result);
     }