Merge pull request #40610 from SasinduDilshara/issue_40541

Fix NPE in regex parser with single quantifiers

compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/RegExpParser.java

@@ -507,8 +507,8 @@ private STNode parseBaseQuantifier() {
             openBrace = invalidateNonDigitNodesAndAddToTrailingMinutiae(openBrace, true);
         }
         STNode leastDigits = parseDigits(true);
-        STNode comma = null;
-        STNode mostDigits = null;
+        STNode comma = STNodeFactory.createEmptyNode();;
+        STNode mostDigits = STNodeFactory.createEmptyNodeList();
         nextToken = peek();
         if (nextToken.kind == SyntaxKind.COMMA_TOKEN) {
             comma = consume();

compiler/ballerina-parser/src/test/resources/expressions/regexp-constructor-expr/regexp_constructor_assert_03.json

@@ -462,6 +462,10 @@
                                                 }
                                               ]
                                             },
+                                            {
+                                              "kind": "LIST",
+                                              "children": []
+                                            },
                                             {
                                               "kind": "CLOSE_BRACE_TOKEN"
                                             }

compiler/ballerina-parser/src/test/resources/expressions/regexp-constructor-expr/regexp_constructor_assert_04.json

@@ -471,6 +471,10 @@
                                                 }
                                               ]
                                             },
+                                            {
+                                              "kind": "LIST",
+                                              "children": []
+                                            },
                                             {
                                               "kind": "CLOSE_BRACE_TOKEN"
                                             }

compiler/ballerina-parser/src/test/resources/expressions/regexp-constructor-expr/regexp_constructor_assert_19.json

@@ -693,6 +693,10 @@
                                                 }
                                               ]
                                             },
+                                            {
+                                              "kind": "LIST",
+                                              "children": []
+                                            },
                                             {
                                               "kind": "CLOSE_BRACE_TOKEN"
                                             }

compiler/ballerina-parser/src/test/resources/expressions/regexp-constructor-expr/regexp_constructor_assert_36.json

@@ -145,6 +145,10 @@
                                                 }
                                               ]
                                             },
+                                            {
+                                              "kind": "LIST",
+                                              "children": []
+                                            },
                                             {
                                               "kind": "CLOSE_BRACE_TOKEN"
                                             }

compiler/ballerina-parser/src/test/resources/expressions/regexp-constructor-expr/regexp_constructor_assert_37.json

@@ -145,6 +145,10 @@
                                                 }
                                               ]
                                             },
+                                            {
+                                              "kind": "LIST",
+                                              "children": []
+                                            },
                                             {
                                               "kind": "CLOSE_BRACE_TOKEN"
                                             }

misc/formatter/modules/formatter-core/src/test/resources/expressions/raw-template/assert/regex_expressions.bal

@@ -0,0 +1,38 @@
+type AnnotRec record {|
+    string:RegExp value;
+|};
+
+annotation AnnotRec annot on type;
+
+@annot {
+    value: re `abc{1}`
+}
+type Foo record {
+    string name;
+};
+
+@annot {
+    value: re `abc{1,}`
+}
+type Foo2 record {
+    string name;
+};
+
+@annot {
+    value: re `abc{1,2}`
+}
+type Foo3 record {
+    string name;
+};
+
+public function test1() {
+    Foo _ = {name: "abc"};
+    Foo2 _ = {name: "abc"};
+    Foo3 _ = {name: "abc"};
+}
+
+public function test2() {
+    string:RegExp _ = re `[A-Z]{1}`;
+    string:RegExp _ = re `[A-Z]{1,2}`;
+    string:RegExp _ = re `[A-Z]{1,}`;
+}

misc/formatter/modules/formatter-core/src/test/resources/expressions/raw-template/source/regex_expressions.bal

@@ -0,0 +1,38 @@
+type AnnotRec record {|
+    string:RegExp value;
+|};
+
+annotation AnnotRec annot on type;
+
+@annot {
+    value: re `abc{1}`
+}
+type Foo record {
+    string name;
+};
+
+@annot {
+    value: re `abc{1,}`
+}
+type Foo2 record {
+    string name;
+};
+
+@annot {
+    value: re `abc{1,2}`
+}
+type Foo3 record {
+    string name;
+};
+
+public function test1() {
+    Foo _={name: "abc"};
+    Foo2 _={name: "abc"};
+    Foo3 _={name: "abc"};
+}
+
+public function test2() {
+    string:RegExp _=re `[A-Z]{1}`;
+    string:RegExp _=re `[A-Z]{1,2}`;
+    string:RegExp _=re `[A-Z]{1,}`;
+}