[C#] Add regex to argument strings in known functions (#4522)

Co-authored-by: Keith Hall <kingkeith+github@gmail.com>
Co-authored-by: deathaxe <16542113+deathaxe@users.noreply.github.com>

Author: 3 people

C#/C#.sublime-syntax

@@ -1789,6 +1789,20 @@ contexts:
           scope: meta.generic.cs punctuation.definition.generic.end.cs
           pop: 1
         - include: type
+    - match: (?:(?:(?:(System)(\.))?(Text)(\.))?(RegularExpressions)(\.))?(Regex)(\.)(Match|IsMatch|Replace)(\()
+      scope: meta.function-call.cs
+      captures:
+        1: variable.other.cs
+        2: punctuation.accessor.dot.cs
+        3: variable.other.cs
+        4: punctuation.accessor.dot.cs
+        5: variable.other.cs
+        6: punctuation.accessor.dot.cs
+        7: support.type.cs
+        8: punctuation.accessor.dot.cs
+        9: variable.function.cs
+        10: meta.group.cs punctuation.section.group.begin.cs
+      push: [function_call_arguments, regex_arguments]
     - match: '((?!{{reserved}}\b){{name}})\s*(\()'
       scope: meta.function-call.cs
       captures:
@@ -1986,6 +2000,20 @@ contexts:
               pop: 1
             - match: '(?=\S)'
               push: line_of_code_in
+        - match: (?:(?:(?:(System)(\.))?(Text)(\.))?(RegularExpressions)(\.))?(Regex)\s*(\()
+          captures:
+            1: variable.other.cs
+            2: punctuation.accessor.dot.cs
+            3: variable.other.cs
+            4: punctuation.accessor.dot.cs
+            5: variable.other.cs
+            6: punctuation.accessor.dot.cs
+            7: support.type.cs
+            8: meta.group.cs punctuation.section.group.begin.cs
+          set: [constructor_arguments, regex_arguments]
+        - match: \(
+          scope: meta.group.cs punctuation.section.group.begin.cs
+          set: [constructor_arguments, arguments]
         - match: (?:\s*((\()\s*(\)))\s*)?(\{)
           captures:
             1: meta.group.cs
@@ -2134,6 +2162,11 @@ contexts:
       pop: 1
     - include: immediately_pop
 
+  regex_arguments:
+    - match: (?=[@$]*")
+      push: regex_string
+    - include: arguments
+
   arguments:
     - match: (out)\s
       captures:
@@ -2160,6 +2193,15 @@ contexts:
         1: variable.parameter.cs
         2: punctuation.separator.argument.value.cs
       push: line_of_code_in
+    - include: semi_colon_before_close_paren
+    - match: (?=\S)
+      push:
+        - include: lambdas
+        - include: line_of_code_in_no_semicolon
+        - match: (?=[;)])
+          pop: 1
+
+  semi_colon_before_close_paren:
     - match: ','
       scope: punctuation.separator.argument.cs
     - match: (?=\))
@@ -2516,15 +2558,15 @@ contexts:
   regex_string:
     - match: '"'
       scope: meta.string.cs string.quoted.double.cs punctuation.definition.string.begin.cs
-      embed: scope:source.regexp
+      embed: scope:source.regexp.cs
       embed_scope: meta.string.cs string.quoted.double.cs source.regexp
       escape: '"'
       escape_captures:
         0: meta.string.cs string.quoted.double.cs punctuation.definition.string.end.cs
       pop: 1
     - match: '@"'
       scope: meta.string.cs string.quoted.double.verbatim.cs punctuation.definition.string.begin.cs
-      embed: scope:source.regexp
+      embed: scope:source.regexp.cs
       embed_scope: meta.string.cs string.quoted.double.verbatim.cs source.regexp
       escape: '"'
       escape_captures:

C#/Embeddings/Regex (for C#).sublime-syntax

@@ -0,0 +1,39 @@
+%YAML 1.2
+---
+name: Regular Expressions (C#)
+scope: source.regexp.cs
+version: 2
+hidden: true
+
+extends: Packages/Regular Expressions/RegExp (Basic).sublime-syntax
+
+variables:
+  capture_group_name: (?:[a-zA-Z_]\w*)
+
+
+contexts:
+  anchors:
+    # Full replacement to un-match $ backrefs
+    - match: \\[bBAZzG]|\^|\$(?![\d{])
+      scope: keyword.control.anchor.regexp
+      push: maybe-unexpected-quantifiers
+
+  group-start:
+    - meta_prepend: true
+    - match: \?(<)({{capture_group_name}})(>)
+      scope: keyword.other.named-capture-group.regexp
+      captures:
+        1: punctuation.definition.capture-group-name.begin.regexp
+        2: entity.name.capture-group.regexp
+        3: punctuation.definition.capture-group-name.end.regexp
+
+  backrefs:
+    - meta_prepend: true
+    - match: \$(\d+)
+      scope: keyword.other.backref-and-recursion.regexp
+      captures:
+        1: variable.other.backref-and-recursion.regexp
+    - match: \${({{capture_group_name}})}
+      scope: keyword.other.backref-and-recursion.regexp
+      captures:
+        1: variable.other.backref-and-recursion.regexp

C#/tests/syntax_test_Strings.cs

@@ -169,3 +169,39 @@ FROM some_table
     no sql here
 /// ^^^^^^^^^^^^ meta.string.cs string.quoted.double.block.cs - source.sql
 """;
+
+Regex rx = new Regex(@"\b(?<word>\w+)\s+(\k<word>)\b", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+///            ^^^^^ meta.instance support.type
+///                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.string source.regexp
+///                                                 ^ meta.string punctuation.definition.string.end - source.regexp
+///                    ^^ keyword.control.anchor
+Match m = Regex.Match(input, @"\ba\w*\b", RegexOptions.IgnoreCase);
+///       ^^^^^ meta.function-call support.type
+///            ^ meta.function-call punctuation.accessor.dot
+///             ^^^^^ meta.function-call variable.function
+///                  ^ meta.group punctuation.section.group.begin
+///                            ^^^^^^^^ meta.string source.regexp
+///                                    ^ meta.string string.quoted.double punctuation.definition.string.end - source.regexp
+
+replaced = Regex.Replace(some_value, "(?!^)([A-Z])", " $1");
+///        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function-call
+///        ^^^^^ support.type
+///             ^ punctuation.accessor.dot
+///              ^^^^^^^ variable.function
+///                     ^ punctuation.section.group.begin
+///                      ^^^^^^^^^^ variable.other
+///                                ^ punctuation.separator.argument
+///                                  ^ meta.string string.quoted.double punctuation.definition.string.begin
+///                                   ^^^^^^^^^^^^ meta.string source.regexp
+///                                               ^ meta.string string.quoted.double punctuation.definition.string.end - source.regexp
+///                                                ^ punctuation.separator.argument
+
+Regex rx = new Regex(@"\bincomplete-missing-paren\b"
+///        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.instance
+///        ^^^ keyword.operator.new
+///            ^^^^^ support.type
+///                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.string
+///                  ^^ string.quoted.double punctuation.definition.string.begin
+///                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.regexp
+///                                                ^ punctuation.definition.string.end - source.regexp
+///                    ^^ keyword.control.anchor