From efe7774c5dc90063232b4c561fea6d79f365feaf Mon Sep 17 00:00:00 2001
From: Jacob Bandes-Storch <jacob@bandes-stor.ch>
Date: Sat, 4 Nov 2023 21:58:02 -0700
Subject: [PATCH] Fix backreference and subpattern highlighting in VS Code

Workaround for https://github.com/microsoft/vscode-textmate/issues/164 and similar issues
---
 Swift.tmLanguage.json     | 113 ++++++++++---
 Swift.tmLanguage.yaml     | 102 ++++++++----
 Syntaxes/Swift.tmLanguage | 328 ++++++++++++++++++++++++++------------
 3 files changed, 387 insertions(+), 156 deletions(-)

diff --git a/Swift.tmLanguage.json b/Swift.tmLanguage.json
index 7e1f855..fe255d1 100644
--- a/Swift.tmLanguage.json
+++ b/Swift.tmLanguage.json
@@ -2312,30 +2312,95 @@
     },
 
     "literals-regular-expression-literal-backreference-or-subpattern": {
-      "match": "(?x)\n(?<esc>\\\\g)(?<NumberRef> (?<num>[+-]?\\d+)(?:(?<op>[+-])(?<num>\\d+))? )\n| (?<esc>\\\\k\\{)(?<NamedRef> (?<name>(?!\\d)\\w+) (?:(?<op>[+-])(?<num>\\d+))? )(?<esc>\\})\n| (?<esc>\\\\g\\{)(?:\\g<NamedRef>|\\g<NumberRef>)(?<esc>\\})\n| (?<esc>\\\\[gk]<)(?:\\g<NamedRef>|\\g<NumberRef>)(?<esc>>)\n| (?<esc>\\\\[gk]')(?:\\g<NamedRef>|\\g<NumberRef>)(?<esc>')\n| (?<keyw>\\(\\?(?:P[=>]|&))\\g<NamedRef>(?<keyw>\\))\n| (?<keyw>\\(\\?R\\))\n| (?<keyw>\\(\\?)\\g<NumberRef>(?<keyw>\\))\n| (?<keyw>\\\\[1-9][0-9]+)",
-      "captures": {
-        "1": { "name": "constant.character.escape.backslash.regexp" },
-        "3": { "name": "constant.numeric.integer.decimal.regexp" },
-        "4": { "name": "keyword.operator.recursion-level.regexp" },
-        "5": { "name": "constant.numeric.integer.decimal.regexp" },
-        "6": { "name": "constant.character.escape.backslash.regexp" },
-        "8": { "name": "variable.language.group-name.regexp" },
-        "9": { "name": "keyword.operator.recursion-level.regexp" },
-        "10": { "name": "constant.numeric.integer.decimal.regexp" },
-        "11": { "name": "constant.character.escape.backslash.regexp" },
-        "12": { "name": "constant.character.escape.backslash.regexp" },
-        "13": { "name": "constant.character.escape.backslash.regexp" },
-        "14": { "name": "constant.character.escape.backslash.regexp" },
-        "15": { "name": "constant.character.escape.backslash.regexp" },
-        "16": { "name": "constant.character.escape.backslash.regexp" },
-        "17": { "name": "constant.character.escape.backslash.regexp" },
-        "18": { "name": "keyword.other.back-reference.regexp" },
-        "19": { "name": "keyword.other.back-reference.regexp" },
-        "20": { "name": "keyword.other.back-reference.regexp" },
-        "21": { "name": "keyword.other.back-reference.regexp" },
-        "22": { "name": "keyword.other.back-reference.regexp" },
-        "23": { "name": "keyword.other.back-reference.regexp" }
-      }
+      "comment": "These patterns are separated to work around issues like https://github.com/microsoft/vscode-textmate/issues/164",
+      "patterns": [
+        {
+          "comment": "'\\g{' NamedOrNumberRef '}'",
+          "match": "(?x)(\\\\g\\{) (?: ((?!\\d)\\w+) (?:([+-])(\\d+))? | ([+-]?\\d+) (?:([+-])(\\d+))? ) (\\})",
+          "captures": {
+            "1": { "name": "constant.character.escape.backslash.regexp" },
+            "2": { "name": "variable.language.group-name.regexp" },
+            "3": { "name": "keyword.operator.recursion-level.regexp" },
+            "4": { "name": "constant.numeric.integer.decimal.regexp" },
+            "5": { "name": "constant.numeric.integer.decimal.regexp" },
+            "6": { "name": "keyword.operator.recursion-level.regexp" },
+            "7": { "name": "constant.numeric.integer.decimal.regexp" },
+            "8": { "name": "constant.character.escape.backslash.regexp" }
+          }
+        },
+
+        {
+          "comment": "'\\g' NumberRef",
+          "match": "(?x)(\\\\g) ([+-]?\\d+) (?:([+-])(\\d+))?",
+          "captures": {
+            "1": { "name": "constant.character.escape.backslash.regexp" },
+            "2": { "name": "constant.numeric.integer.decimal.regexp" },
+            "3": { "name": "keyword.operator.recursion-level.regexp" },
+            "4": { "name": "constant.numeric.integer.decimal.regexp" }
+          }
+        },
+
+        {
+          "comment": "'\\k<' NamedOrNumberRef '>'\n \"\\k'\" NamedOrNumberRef \"'\"\n '\\g<' NamedOrNumberRef '>'\n \"\\g'\" NamedOrNumberRef \"'\"",
+          "match": "(?x)(\\\\[gk](<)|\\\\[gk]') (?: ((?!\\d)\\w+) (?:([+-])(\\d+))? | ([+-]?\\d+) (?:([+-])(\\d+))? ) ((?(2)>|'))",
+          "captures": {
+            "1": { "name": "constant.character.escape.backslash.regexp" },
+            "3": { "name": "variable.language.group-name.regexp" },
+            "4": { "name": "keyword.operator.recursion-level.regexp" },
+            "5": { "name": "constant.numeric.integer.decimal.regexp" },
+            "6": { "name": "constant.numeric.integer.decimal.regexp" },
+            "7": { "name": "keyword.operator.recursion-level.regexp" },
+            "8": { "name": "constant.numeric.integer.decimal.regexp" },
+            "9": { "name": "constant.character.escape.backslash.regexp" }
+          }
+        },
+
+        {
+          "comment": "'\\k{' NamedRef '}'",
+          "match": "(?x)(\\\\k\\{) ((?!\\d)\\w+) (?:([+-])(\\d+))? (\\})",
+          "captures": {
+            "1": { "name": "constant.character.escape.backslash.regexp" },
+            "2": { "name": "variable.language.group-name.regexp" },
+            "3": { "name": "keyword.operator.recursion-level.regexp" },
+            "4": { "name": "constant.numeric.integer.decimal.regexp" },
+            "5": { "name": "constant.character.escape.backslash.regexp" }
+          }
+        },
+
+        {
+          "name": "keyword.other.back-reference.regexp",
+          "match": "\\\\[1-9][0-9]+"
+        },
+
+        {
+          "comment": "'(?P=' NamedRef ')'",
+          "match": "(?x)(\\(\\?(?:P[=>]|&)) ((?!\\d)\\w+) (?:([+-])(\\d+))? (\\))",
+          "captures": {
+            "1": { "name": "keyword.other.back-reference.regexp" },
+            "2": { "name": "variable.language.group-name.regexp" },
+            "3": { "name": "keyword.operator.recursion-level.regexp" },
+            "4": { "name": "constant.numeric.integer.decimal.regexp" },
+            "5": { "name": "keyword.other.back-reference.regexp" }
+          }
+        },
+
+        {
+          "name": "keyword.other.back-reference.regexp",
+          "match": "\\(\\?R\\)"
+        },
+
+        {
+          "comment": "'(?' NumberRef ')'",
+          "match": "(?x)(\\(\\?) ([+-]?\\d+) (?:([+-])(\\d+))? (\\))",
+          "captures": {
+            "1": { "name": "keyword.other.back-reference.regexp" },
+            "2": { "name": "constant.numeric.integer.decimal.regexp" },
+            "3": { "name": "keyword.operator.recursion-level.regexp" },
+            "4": { "name": "constant.numeric.integer.decimal.regexp" },
+            "5": { "name": "keyword.other.back-reference.regexp" }
+          }
+        }
+      ]
     },
 
     "literals-regular-expression-literal-backtracking-directive-or-global-matching-option": {
diff --git a/Swift.tmLanguage.yaml b/Swift.tmLanguage.yaml
index 8dadb7b..40668dd 100644
--- a/Swift.tmLanguage.yaml
+++ b/Swift.tmLanguage.yaml
@@ -1866,39 +1866,75 @@ repository:
           13: { name: invalid.illegal.returns-not-allowed.regexp }
 
   literals-regular-expression-literal-backreference-or-subpattern:
-    match: |-
-      (?x)
-      (?<esc>\\g)(?<NumberRef> (?<num>[+-]?\d+)(?:(?<op>[+-])(?<num>\d+))? )
-      | (?<esc>\\k\{)(?<NamedRef> (?<name>(?!\d)\w+) (?:(?<op>[+-])(?<num>\d+))? )(?<esc>\})
-      | (?<esc>\\g\{)(?:\g<NamedRef>|\g<NumberRef>)(?<esc>\})
-      | (?<esc>\\[gk]<)(?:\g<NamedRef>|\g<NumberRef>)(?<esc>>)
-      | (?<esc>\\[gk]')(?:\g<NamedRef>|\g<NumberRef>)(?<esc>')
-      | (?<keyw>\(\?(?:P[=>]|&))\g<NamedRef>(?<keyw>\))
-      | (?<keyw>\(\?R\))
-      | (?<keyw>\(\?)\g<NumberRef>(?<keyw>\))
-      | (?<keyw>\\[1-9][0-9]+)
-    captures:
-      1: { name: constant.character.escape.backslash.regexp }
-      3: { name: constant.numeric.integer.decimal.regexp }
-      4: { name: keyword.operator.recursion-level.regexp }
-      5: { name: constant.numeric.integer.decimal.regexp }
-      6: { name: constant.character.escape.backslash.regexp }
-      8: { name: variable.language.group-name.regexp }
-      9: { name: keyword.operator.recursion-level.regexp }
-      10: { name: constant.numeric.integer.decimal.regexp }
-      11: { name: constant.character.escape.backslash.regexp }
-      12: { name: constant.character.escape.backslash.regexp }
-      13: { name: constant.character.escape.backslash.regexp }
-      14: { name: constant.character.escape.backslash.regexp }
-      15: { name: constant.character.escape.backslash.regexp }
-      16: { name: constant.character.escape.backslash.regexp }
-      17: { name: constant.character.escape.backslash.regexp }
-      18: { name: keyword.other.back-reference.regexp }
-      19: { name: keyword.other.back-reference.regexp }
-      20: { name: keyword.other.back-reference.regexp }
-      21: { name: keyword.other.back-reference.regexp }
-      22: { name: keyword.other.back-reference.regexp }
-      23: { name: keyword.other.back-reference.regexp }
+    # These patterns are separated to work around issues like https://github.com/microsoft/vscode-textmate/issues/164
+    patterns:
+      # '\g{' NamedOrNumberRef '}'
+      - match: '(?x)(\\g\{) (?: ((?!\d)\w+) (?:([+-])(\d+))? | ([+-]?\d+) (?:([+-])(\d+))? ) (\})'
+        captures:
+          1: { name: constant.character.escape.backslash.regexp }
+          2: { name: variable.language.group-name.regexp }
+          3: { name: keyword.operator.recursion-level.regexp }
+          4: { name: constant.numeric.integer.decimal.regexp }
+          5: { name: constant.numeric.integer.decimal.regexp }
+          6: { name: keyword.operator.recursion-level.regexp }
+          7: { name: constant.numeric.integer.decimal.regexp }
+          8: { name: constant.character.escape.backslash.regexp }
+
+      # '\g' NumberRef
+      - match: (?x)(\\g) ([+-]?\d+) (?:([+-])(\d+))?
+        captures:
+          1: { name: constant.character.escape.backslash.regexp }
+          2: { name: constant.numeric.integer.decimal.regexp }
+          3: { name: keyword.operator.recursion-level.regexp }
+          4: { name: constant.numeric.integer.decimal.regexp }
+
+      # '\k<' NamedOrNumberRef '>'
+      # "\k'" NamedOrNumberRef "'"
+      # '\g<' NamedOrNumberRef '>'
+      # "\g'" NamedOrNumberRef "'"
+      - match: '(?x)(\\[gk](<)|\\[gk]'') (?: ((?!\d)\w+) (?:([+-])(\d+))? | ([+-]?\d+) (?:([+-])(\d+))? ) ((?(2)>|''))'
+        captures:
+          1: { name: constant.character.escape.backslash.regexp }
+          3: { name: variable.language.group-name.regexp }
+          4: { name: keyword.operator.recursion-level.regexp }
+          5: { name: constant.numeric.integer.decimal.regexp }
+          6: { name: constant.numeric.integer.decimal.regexp }
+          7: { name: keyword.operator.recursion-level.regexp }
+          8: { name: constant.numeric.integer.decimal.regexp }
+          9: { name: constant.character.escape.backslash.regexp }
+
+      # '\k{' NamedRef '}'
+      - match: (?x)(\\k\{) ((?!\d)\w+) (?:([+-])(\d+))? (\})
+        captures:
+          1: { name: constant.character.escape.backslash.regexp }
+          2: { name: variable.language.group-name.regexp }
+          3: { name: keyword.operator.recursion-level.regexp }
+          4: { name: constant.numeric.integer.decimal.regexp }
+          5: { name: constant.character.escape.backslash.regexp }
+
+      - name: keyword.other.back-reference.regexp
+        match: \\[1-9][0-9]+
+
+      # '(?P=' NamedRef ')'
+      - match: (?x)(\(\?(?:P[=>]|&)) ((?!\d)\w+) (?:([+-])(\d+))? (\))
+        captures:
+          1: { name: keyword.other.back-reference.regexp }
+          2: { name: variable.language.group-name.regexp }
+          3: { name: keyword.operator.recursion-level.regexp }
+          4: { name: constant.numeric.integer.decimal.regexp }
+          5: { name: keyword.other.back-reference.regexp }
+
+      - name: keyword.other.back-reference.regexp
+        match: \(\?R\)
+
+      # '(?' NumberRef ')'
+      - match: (?x)(\(\?) ([+-]?\d+) (?:([+-])(\d+))? (\))
+        captures:
+          1: { name: keyword.other.back-reference.regexp }
+          2: { name: constant.numeric.integer.decimal.regexp }
+          3: { name: keyword.operator.recursion-level.regexp }
+          4: { name: constant.numeric.integer.decimal.regexp }
+          5: { name: keyword.other.back-reference.regexp }
 
   literals-regular-expression-literal-backtracking-directive-or-global-matching-option:
     match: |-
diff --git a/Syntaxes/Swift.tmLanguage b/Syntaxes/Swift.tmLanguage
index a1dbee2..842ea21 100644
--- a/Syntaxes/Swift.tmLanguage
+++ b/Syntaxes/Swift.tmLanguage
@@ -5019,125 +5019,255 @@
       </dict>
       <key>literals-regular-expression-literal-backreference-or-subpattern</key>
       <dict>
-        <key>match</key>
-        <string>(?x)
-(?&lt;esc&gt;\\g)(?&lt;NumberRef&gt; (?&lt;num&gt;[+-]?\d+)(?:(?&lt;op&gt;[+-])(?&lt;num&gt;\d+))? )
-| (?&lt;esc&gt;\\k\{)(?&lt;NamedRef&gt; (?&lt;name&gt;(?!\d)\w+) (?:(?&lt;op&gt;[+-])(?&lt;num&gt;\d+))? )(?&lt;esc&gt;\})
-| (?&lt;esc&gt;\\g\{)(?:\g&lt;NamedRef&gt;|\g&lt;NumberRef&gt;)(?&lt;esc&gt;\})
-| (?&lt;esc&gt;\\[gk]&lt;)(?:\g&lt;NamedRef&gt;|\g&lt;NumberRef&gt;)(?&lt;esc&gt;&gt;)
-| (?&lt;esc&gt;\\[gk]')(?:\g&lt;NamedRef&gt;|\g&lt;NumberRef&gt;)(?&lt;esc&gt;')
-| (?&lt;keyw&gt;\(\?(?:P[=&gt;]|&amp;))\g&lt;NamedRef&gt;(?&lt;keyw&gt;\))
-| (?&lt;keyw&gt;\(\?R\))
-| (?&lt;keyw&gt;\(\?)\g&lt;NumberRef&gt;(?&lt;keyw&gt;\))
-| (?&lt;keyw&gt;\\[1-9][0-9]+)</string>
-        <key>captures</key>
-        <dict>
-          <key>1</key>
-          <dict>
-            <key>name</key>
-            <string>constant.character.escape.backslash.regexp</string>
-          </dict>
-          <key>3</key>
-          <dict>
-            <key>name</key>
-            <string>constant.numeric.integer.decimal.regexp</string>
-          </dict>
-          <key>4</key>
-          <dict>
-            <key>name</key>
-            <string>keyword.operator.recursion-level.regexp</string>
-          </dict>
-          <key>5</key>
-          <dict>
-            <key>name</key>
-            <string>constant.numeric.integer.decimal.regexp</string>
-          </dict>
-          <key>6</key>
-          <dict>
-            <key>name</key>
-            <string>constant.character.escape.backslash.regexp</string>
-          </dict>
-          <key>8</key>
-          <dict>
-            <key>name</key>
-            <string>variable.language.group-name.regexp</string>
-          </dict>
-          <key>9</key>
-          <dict>
-            <key>name</key>
-            <string>keyword.operator.recursion-level.regexp</string>
-          </dict>
-          <key>10</key>
-          <dict>
-            <key>name</key>
-            <string>constant.numeric.integer.decimal.regexp</string>
-          </dict>
-          <key>11</key>
-          <dict>
-            <key>name</key>
-            <string>constant.character.escape.backslash.regexp</string>
-          </dict>
-          <key>12</key>
-          <dict>
-            <key>name</key>
-            <string>constant.character.escape.backslash.regexp</string>
-          </dict>
-          <key>13</key>
-          <dict>
-            <key>name</key>
-            <string>constant.character.escape.backslash.regexp</string>
-          </dict>
-          <key>14</key>
-          <dict>
-            <key>name</key>
-            <string>constant.character.escape.backslash.regexp</string>
-          </dict>
-          <key>15</key>
-          <dict>
-            <key>name</key>
-            <string>constant.character.escape.backslash.regexp</string>
-          </dict>
-          <key>16</key>
+        <key>comment</key>
+        <string>These patterns are separated to work around issues like https://github.com/microsoft/vscode-textmate/issues/164</string>
+        <key>patterns</key>
+        <array>
           <dict>
-            <key>name</key>
-            <string>constant.character.escape.backslash.regexp</string>
+            <key>comment</key>
+            <string>'\g{' NamedOrNumberRef '}'</string>
+            <key>match</key>
+            <string>(?x)(\\g\{) (?: ((?!\d)\w+) (?:([+-])(\d+))? | ([+-]?\d+) (?:([+-])(\d+))? ) (\})</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>constant.character.escape.backslash.regexp</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>variable.language.group-name.regexp</string>
+              </dict>
+              <key>3</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.operator.recursion-level.regexp</string>
+              </dict>
+              <key>4</key>
+              <dict>
+                <key>name</key>
+                <string>constant.numeric.integer.decimal.regexp</string>
+              </dict>
+              <key>5</key>
+              <dict>
+                <key>name</key>
+                <string>constant.numeric.integer.decimal.regexp</string>
+              </dict>
+              <key>6</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.operator.recursion-level.regexp</string>
+              </dict>
+              <key>7</key>
+              <dict>
+                <key>name</key>
+                <string>constant.numeric.integer.decimal.regexp</string>
+              </dict>
+              <key>8</key>
+              <dict>
+                <key>name</key>
+                <string>constant.character.escape.backslash.regexp</string>
+              </dict>
+            </dict>
           </dict>
-          <key>17</key>
           <dict>
-            <key>name</key>
-            <string>constant.character.escape.backslash.regexp</string>
+            <key>comment</key>
+            <string>'\g' NumberRef</string>
+            <key>match</key>
+            <string>(?x)(\\g) ([+-]?\d+) (?:([+-])(\d+))?</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>constant.character.escape.backslash.regexp</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>constant.numeric.integer.decimal.regexp</string>
+              </dict>
+              <key>3</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.operator.recursion-level.regexp</string>
+              </dict>
+              <key>4</key>
+              <dict>
+                <key>name</key>
+                <string>constant.numeric.integer.decimal.regexp</string>
+              </dict>
+            </dict>
           </dict>
-          <key>18</key>
           <dict>
-            <key>name</key>
-            <string>keyword.other.back-reference.regexp</string>
+            <key>comment</key>
+            <string>'\k&lt;' NamedOrNumberRef '&gt;'
+ "\k'" NamedOrNumberRef "'"
+ '\g&lt;' NamedOrNumberRef '&gt;'
+ "\g'" NamedOrNumberRef "'"</string>
+            <key>match</key>
+            <string>(?x)(\\[gk](&lt;)|\\[gk]') (?: ((?!\d)\w+) (?:([+-])(\d+))? | ([+-]?\d+) (?:([+-])(\d+))? ) ((?(2)&gt;|'))</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>constant.character.escape.backslash.regexp</string>
+              </dict>
+              <key>3</key>
+              <dict>
+                <key>name</key>
+                <string>variable.language.group-name.regexp</string>
+              </dict>
+              <key>4</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.operator.recursion-level.regexp</string>
+              </dict>
+              <key>5</key>
+              <dict>
+                <key>name</key>
+                <string>constant.numeric.integer.decimal.regexp</string>
+              </dict>
+              <key>6</key>
+              <dict>
+                <key>name</key>
+                <string>constant.numeric.integer.decimal.regexp</string>
+              </dict>
+              <key>7</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.operator.recursion-level.regexp</string>
+              </dict>
+              <key>8</key>
+              <dict>
+                <key>name</key>
+                <string>constant.numeric.integer.decimal.regexp</string>
+              </dict>
+              <key>9</key>
+              <dict>
+                <key>name</key>
+                <string>constant.character.escape.backslash.regexp</string>
+              </dict>
+            </dict>
           </dict>
-          <key>19</key>
           <dict>
-            <key>name</key>
-            <string>keyword.other.back-reference.regexp</string>
+            <key>comment</key>
+            <string>'\k{' NamedRef '}'</string>
+            <key>match</key>
+            <string>(?x)(\\k\{) ((?!\d)\w+) (?:([+-])(\d+))? (\})</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>constant.character.escape.backslash.regexp</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>variable.language.group-name.regexp</string>
+              </dict>
+              <key>3</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.operator.recursion-level.regexp</string>
+              </dict>
+              <key>4</key>
+              <dict>
+                <key>name</key>
+                <string>constant.numeric.integer.decimal.regexp</string>
+              </dict>
+              <key>5</key>
+              <dict>
+                <key>name</key>
+                <string>constant.character.escape.backslash.regexp</string>
+              </dict>
+            </dict>
           </dict>
-          <key>20</key>
           <dict>
             <key>name</key>
             <string>keyword.other.back-reference.regexp</string>
+            <key>match</key>
+            <string>\\[1-9][0-9]+</string>
           </dict>
-          <key>21</key>
           <dict>
-            <key>name</key>
-            <string>keyword.other.back-reference.regexp</string>
+            <key>comment</key>
+            <string>'(?P=' NamedRef ')'</string>
+            <key>match</key>
+            <string>(?x)(\(\?(?:P[=&gt;]|&amp;)) ((?!\d)\w+) (?:([+-])(\d+))? (\))</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.other.back-reference.regexp</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>variable.language.group-name.regexp</string>
+              </dict>
+              <key>3</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.operator.recursion-level.regexp</string>
+              </dict>
+              <key>4</key>
+              <dict>
+                <key>name</key>
+                <string>constant.numeric.integer.decimal.regexp</string>
+              </dict>
+              <key>5</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.other.back-reference.regexp</string>
+              </dict>
+            </dict>
           </dict>
-          <key>22</key>
           <dict>
             <key>name</key>
             <string>keyword.other.back-reference.regexp</string>
+            <key>match</key>
+            <string>\(\?R\)</string>
           </dict>
-          <key>23</key>
           <dict>
-            <key>name</key>
-            <string>keyword.other.back-reference.regexp</string>
+            <key>comment</key>
+            <string>'(?' NumberRef ')'</string>
+            <key>match</key>
+            <string>(?x)(\(\?) ([+-]?\d+) (?:([+-])(\d+))? (\))</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.other.back-reference.regexp</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>constant.numeric.integer.decimal.regexp</string>
+              </dict>
+              <key>3</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.operator.recursion-level.regexp</string>
+              </dict>
+              <key>4</key>
+              <dict>
+                <key>name</key>
+                <string>constant.numeric.integer.decimal.regexp</string>
+              </dict>
+              <key>5</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.other.back-reference.regexp</string>
+              </dict>
+            </dict>
           </dict>
-        </dict>
+        </array>
       </dict>
       <key>literals-regular-expression-literal-backtracking-directive-or-global-matching-option</key>
       <dict>