From b7458c8f106d77ce638c203be22569c5da5ef9d1 Mon Sep 17 00:00:00 2001
From: poorna2152 <poorna2152@gmail.com>
Date: Wed, 25 Oct 2023 11:05:05 +0530
Subject: [PATCH] Update the regex in escaping

---
 .../wso2/ballerinalang/compiler/parser/BLangNodeBuilder.java   | 3 ++-
 .../src/main/java/io/ballerina/identifier/Utils.java           | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangNodeBuilder.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangNodeBuilder.java
index 1dadf7e7f58a..eaf924ef3a3b 100644
--- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangNodeBuilder.java
+++ b/compiler/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
index e18228a880f5..461da3c79f35 100644
--- 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);
     }