diff --git a/grammars/csharp.tmLanguage b/grammars/csharp.tmLanguage
index 6ab5d4e..66363ca 100644
--- a/grammars/csharp.tmLanguage
+++ b/grammars/csharp.tmLanguage
@@ -3428,6 +3428,10 @@
             <key>include</key>
             <string>#nameof-expression</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#expression-operators</string>
+          </dict>
         </array>
       </dict>
       <key>relational-pattern</key>
@@ -6243,16 +6247,16 @@
       <key>assignment-expression</key>
       <dict>
         <key>begin</key>
-        <string>(\*=|/=|%=|\+=|-=|\?\?=|\&amp;=|\^=|&lt;&lt;=|&gt;&gt;&gt;?=|\|=|=)(?!=|&gt;)</string>
+        <string>(?:\*|/|%|\+|-|\?\?|\&amp;|\^|&lt;&lt;|&gt;&gt;&gt;?|\|)?=(?!=|&gt;)</string>
         <key>beginCaptures</key>
         <dict>
-          <key>1</key>
+          <key>0</key>
           <dict>
             <key>patterns</key>
             <array>
               <dict>
                 <key>include</key>
-                <string>#expression-operators</string>
+                <string>#assignment-operators</string>
               </dict>
             </array>
           </dict>
@@ -6271,7 +6275,7 @@
           </dict>
         </array>
       </dict>
-      <key>expression-operators</key>
+      <key>assignment-operators</key>
       <dict>
         <key>patterns</key>
         <array>
@@ -6287,6 +6291,18 @@
             <key>match</key>
             <string>\&amp;=|\^=|&lt;&lt;=|&gt;&gt;&gt;?=|\|=</string>
           </dict>
+          <dict>
+            <key>name</key>
+            <string>keyword.operator.assignment.cs</string>
+            <key>match</key>
+            <string>\=</string>
+          </dict>
+        </array>
+      </dict>
+      <key>expression-operators</key>
+      <dict>
+        <key>patterns</key>
+        <array>
           <dict>
             <key>name</key>
             <string>keyword.operator.bitwise.shift.cs</string>
@@ -6317,12 +6333,6 @@
             <key>match</key>
             <string>\&amp;|~|\^|\|</string>
           </dict>
-          <dict>
-            <key>name</key>
-            <string>keyword.operator.assignment.cs</string>
-            <key>match</key>
-            <string>\=</string>
-          </dict>
           <dict>
             <key>name</key>
             <string>keyword.operator.decrement.cs</string>
diff --git a/grammars/csharp.tmLanguage.cson b/grammars/csharp.tmLanguage.cson
index 8cb546f..6a005ef 100644
--- a/grammars/csharp.tmLanguage.cson
+++ b/grammars/csharp.tmLanguage.cson
@@ -2122,6 +2122,9 @@ repository:
       {
         include: "#nameof-expression"
       }
+      {
+        include: "#expression-operators"
+      }
     ]
   "relational-pattern":
     begin: "<=?|>=?"
@@ -3713,12 +3716,12 @@ repository:
       "0":
         name: "punctuation.separator.colon.cs"
   "assignment-expression":
-    begin: "(\\*=|/=|%=|\\+=|-=|\\?\\?=|\\&=|\\^=|<<=|>>>?=|\\|=|=)(?!=|>)"
+    begin: "(?:\\*|/|%|\\+|-|\\?\\?|\\&|\\^|<<|>>>?|\\|)?=(?!=|>)"
     beginCaptures:
-      "1":
+      "0":
         patterns: [
           {
-            include: "#expression-operators"
+            include: "#assignment-operators"
           }
         ]
     end: "(?=[,\\)\\];}])"
@@ -3730,7 +3733,7 @@ repository:
         include: "#expression"
       }
     ]
-  "expression-operators":
+  "assignment-operators":
     patterns: [
       {
         name: "keyword.operator.assignment.compound.cs"
@@ -3740,6 +3743,13 @@ repository:
         name: "keyword.operator.assignment.compound.bitwise.cs"
         match: "\\&=|\\^=|<<=|>>>?=|\\|="
       }
+      {
+        name: "keyword.operator.assignment.cs"
+        match: "\\="
+      }
+    ]
+  "expression-operators":
+    patterns: [
       {
         name: "keyword.operator.bitwise.shift.cs"
         match: "<<|>>>?"
@@ -3760,10 +3770,6 @@ repository:
         name: "keyword.operator.bitwise.cs"
         match: "\\&|~|\\^|\\|"
       }
-      {
-        name: "keyword.operator.assignment.cs"
-        match: "\\="
-      }
       {
         name: "keyword.operator.decrement.cs"
         match: "--"
diff --git a/src/csharp.tmLanguage.yml b/src/csharp.tmLanguage.yml
index abf3407..fb2a866 100644
--- a/src/csharp.tmLanguage.yml
+++ b/src/csharp.tmLanguage.yml
@@ -1254,6 +1254,7 @@ repository:
     - include: '#verbatim-string-literal'
     - include: '#typeof-or-default-expression'
     - include: '#nameof-expression'
+    - include: '#expression-operators'
 
   relational-pattern:
     begin: <=?|>=?
@@ -2352,22 +2353,27 @@ repository:
       '0': { name: punctuation.separator.colon.cs }
 
   assignment-expression:
-    begin: (\*=|/=|%=|\+=|-=|\?\?=|\&=|\^=|<<=|>>>?=|\|=|=)(?!=|>)
+    begin: (?:\*|/|%|\+|-|\?\?|\&|\^|<<|>>>?|\|)?=(?!=|>)
     beginCaptures:
-      1:
+      0:
         patterns:
-        - include: '#expression-operators'
+        - include: '#assignment-operators'
     end: (?=[,\)\];}])
     patterns:
     - include: '#ref-modifier'
     - include: '#expression'
   
-  expression-operators:
+  assignment-operators:
     patterns:
     - name: keyword.operator.assignment.compound.cs
       match: \*=|/=|%=|\+=|-=|\?\?=
     - name: keyword.operator.assignment.compound.bitwise.cs
       match: \&=|\^=|<<=|>>>?=|\|=
+    - name: keyword.operator.assignment.cs
+      match: \=
+
+  expression-operators:
+    patterns:
     - name: keyword.operator.bitwise.shift.cs
       match: <<|>>>?
     - name: keyword.operator.comparison.cs
@@ -2378,8 +2384,6 @@ repository:
       match: \!|&&|\|\|
     - name: keyword.operator.bitwise.cs
       match: \&|~|\^|\|
-    - name: keyword.operator.assignment.cs
-      match: \=
     - name: keyword.operator.decrement.cs
       match: --
     - name: keyword.operator.increment.cs