Fix the new expression end regex

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -912,7 +912,7 @@ repository:
     beginCaptures:
       '1': { name: keyword.operator.new.ts }
     # new-expr ends just before any type or call arguments. Type arguments will be picked up by #cast.
-    end: '(?=[(;]|$)'
+    end: '(?=[(;),]|$)'
     patterns:
     - include: '#type'
     - include: '#comment'
@@ -984,7 +984,7 @@ repository:
       captures:
         '1': { name: variable.parameter.ts }
     - name: meta.arrow.ts
-      begin: (?x)(?<=return|throw|yield|await|async|[=(,:>*])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=>)
+      begin: (?x)(?<=return|throw|yield|await|async|[=(\[,:>*])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=>)
       end: (?==>)
       patterns:
       - include: '#function-parameters'

TypeScript.tmLanguage

@@ -182,7 +182,7 @@
 				</dict>
 				<dict>
 					<key>begin</key>
-					<string>(?x)(?&lt;=return|throw|yield|await|async|[=(,:&gt;*])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=&gt;)</string>
+					<string>(?x)(?&lt;=return|throw|yield|await|async|[=(\[,:&gt;*])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=&gt;)</string>
 					<key>end</key>
 					<string>(?==&gt;)</string>
 					<key>name</key>
@@ -2151,7 +2151,7 @@
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>(?=[(;]|$)</string>
+			<string>(?=[(;),]|$)</string>
 			<key>name</key>
 			<string>new.expr.ts</string>
 			<key>patterns</key>

TypeScriptReact.YAML-tmLanguage

@@ -902,7 +902,7 @@ repository:
     beginCaptures:
       '1': { name: keyword.operator.new.tsx }
     # new-expr ends just before any type or call arguments. Type arguments will be picked up by #cast.
-    end: '(?=[(;]|$)'
+    end: '(?=[(;),]|$)'
     patterns:
     - include: '#type'
     - include: '#comment'
@@ -974,7 +974,7 @@ repository:
       captures:
         '1': { name: variable.parameter.tsx }
     - name: meta.arrow.tsx
-      begin: (?x)(?<=return|throw|yield|await|async|[=(,:>*])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=>)
+      begin: (?x)(?<=return|throw|yield|await|async|[=(\[,:>*])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=>)
       end: (?==>)
       patterns:
       - include: '#function-parameters'

TypeScriptReact.tmLanguage

@@ -182,7 +182,7 @@
 				</dict>
 				<dict>
 					<key>begin</key>
-					<string>(?x)(?&lt;=return|throw|yield|await|async|[=(,:&gt;*])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=&gt;)</string>
+					<string>(?x)(?&lt;=return|throw|yield|await|async|[=(\[,:&gt;*])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=&gt;)</string>
 					<key>end</key>
 					<string>(?==&gt;)</string>
 					<key>name</key>
@@ -2537,7 +2537,7 @@
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>(?=[(;]|$)</string>
+			<string>(?=[(;),]|$)</string>
 			<key>name</key>
 			<string>new.expr.tsx</string>
 			<key>patterns</key>

tests/baselines/Issue230.baseline.txt

@@ -0,0 +1,6 @@
+// Note: `new Date` without parenthesis (`new Date()`)
+ctrl.filter("dateFilter", () => (input: mycivis.IAll[], date: Date = new Date) => input.filter((value, index, array) => {
+    let date2 = value.date || (value.day) ? moment(`${value.day} ${value.time}`, "YYYY-MM-DD HH:mm").toDate() : next_wday(value.wday);
+
+    return moment(date).format("DD/MMM/YYYY") === moment(date2).format("DD/MMM/YYYY");
+}));

tests/baselines/Issue248.baseline.txt

@@ -0,0 +1,36 @@
+class C1 {
+    m1 = 1;
+    static s1() {
+        return [() => (new this).m1];
+    }
+}
+class C2 {
+    m1 = 1;
+    static s1() {
+        return [() => (new this).m1];
+    }
+}
+class C3 {
+    m1 = 1;
+    static s1() {
+        return [() => (new this).m1];
+    }
+}
+class C4 {
+    m1 = 1;
+    static s1() {
+        return [() => (new this).m1];
+    }
+}
+class C5 {
+    m1 = 1;
+    static s1() {
+        return [() => (new this).m1];
+    }
+}
+class C6 {
+    m1 = 1;
+    static s1() {
+        return [() => (new this).m1];
+    }
+}

tests/baselines/Issue250.baseline.txt

@@ -0,0 +1,22 @@
+/** Meta-part that defins a Form */
+export class FormType extends Type {
+
+  /** @internal Original FormType instance */
+  static Original = function () {
+    let type = new FormType;
+
+    // define embed field
+    type.defineField(DesignID.Embed, new BooleanAtom(false));
+
+    // define plan choice
+    type.defineField(DesignID.Plan, PlanChoice.Original);
+
+    // define fields list
+    let fields =
+      type.defineField(DesignID.Fields, new Ordering(new FieldDesign));
+    // embed field list
+    fields.embed = true;
+
+    return type;
+  } ();
+}