Add with expression

dotnet · Aug 1, 2023 · 5757be9 · 5757be9
1 parent 7d29a39
commit 5757be9
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 0 deletions.
diff --git a/grammars/csharp.tmLanguage b/grammars/csharp.tmLanguage
@@ -423,6 +423,10 @@
             <key>include</key>
             <string>#switch-expression</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#with-expression</string>
+          </dict>
           <dict>
             <key>include</key>
             <string>#conditional-operator</string>
@@ -3017,6 +3021,28 @@
           </dict>
         </array>
       </dict>
+      <key>with-expression</key>
+      <dict>
+        <key>begin</key>
+        <string>(?&lt;!\.)\b(with)\b\s*(?=\{|$)</string>
+        <key>beginCaptures</key>
+        <dict>
+          <key>1</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.other.with.cs</string>
+          </dict>
+        </dict>
+        <key>end</key>
+        <string>(?&lt;=\})</string>
+        <key>patterns</key>
+        <array>
+          <dict>
+            <key>include</key>
+            <string>#initializer-expression</string>
+          </dict>
+        </array>
+      </dict>
       <key>switch-pattern</key>
       <dict>
         <key>begin</key>

diff --git a/grammars/csharp.tmLanguage.cson b/grammars/csharp.tmLanguage.cson
@@ -300,6 +300,9 @@ repository:
       {
         include: "#switch-expression"
       }
+      {
+        include: "#with-expression"
+      }
       {
         include: "#conditional-operator"
       }
@@ -1884,6 +1887,17 @@ repository:
         ]
       }
     ]
+  "with-expression":
+    begin: "(?<!\\.)\\b(with)\\b\\s*(?=\\{|$)"
+    beginCaptures:
+      "1":
+        name: "keyword.other.with.cs"
+    end: "(?<=\\})"
+    patterns: [
+      {
+        include: "#initializer-expression"
+      }
+    ]
   "switch-pattern":
     begin: '''
       (?x) # e.g. int x OR var x

diff --git a/src/csharp.tmLanguage.yml b/src/csharp.tmLanguage.yml
@@ -121,6 +121,7 @@ repository:
     - include: '#type-builtin'
     - include: '#this-or-base-expression'
     - include: '#switch-expression'
+    - include: '#with-expression'
     - include: '#conditional-operator'
     - include: '#expression-operators'
     - include: '#await-expression'
@@ -1120,6 +1121,14 @@ repository:
       - include: '#expression-body'
       - include: '#punctuation-comma'
 
+  with-expression:
+    begin: (?<!\.)\b(with)\b\s*(?=\{|$)
+    beginCaptures:
+      '1': { name: keyword.other.with.cs }
+    end: (?<=\})
+    patterns:
+    - include: '#initializer-expression'
+
   switch-pattern:
     begin: |-
       (?x) # e.g. int x OR var x