Merge pull request #192 from DustinCampbell/jamesqo-fix-cs6-keywords

Add support for C# 6 keywords

Author: DustinCampbell

syntaxes/csharp.json

@@ -293,15 +293,15 @@
     "keywords": {
       "patterns": [
         {
-          "match": "\\b(if|else|while|for|foreach|in|do|return|continue|break|switch|case|default|goto|throw|try|catch|finally|lock|yield|await)\\b",
+          "match": "\\b(if|else|while|for|foreach|in|do|return|continue|break|switch|case|default|goto|throw|try|catch|finally|lock|yield|await|when)\\b",
           "name": "keyword.control.cs"
         },
         {
           "match": "\\b(from|where|select|group|into|orderby|join|let|on|equals|by|ascending|descending)\\b",
           "name": "keyword.linq.cs"
         },
         {
-          "match": "\\b(new|is|as|using|checked|unchecked|typeof|sizeof|override|readonly|stackalloc)\\b",
+          "match": "\\b(new|is|as|using|checked|unchecked|typeof|sizeof|override|readonly|stackalloc|nameof)\\b",
           "name": "keyword.operator.cs"
         },
         {
@@ -313,7 +313,7 @@
           "name": "storage.type.var.cs"
         },
         {
-          "match": "[@]\\b(var|event|delegate|add|remove|set|get|value|new|is|as|using|checked|unchecked|typeof|sizeof |override|readonly|stackalloc|from|where|select|group|into|orderby|join|let|on|equals|by|ascending|descending |if|else|while|for|foreach|in|do|return|continue|break|switch|case|default|goto|throw|try|catch|finally|lock|yield|await)\\b",
+          "match": "[@]\\b(var|event|delegate|add|remove|set|get|value|new|is|as|using|checked|unchecked|typeof|sizeof|nameof|when|override|readonly|stackalloc|from|where|select|group|into|orderby|join|let|on|equals|by|ascending|descending |if|else|while|for|foreach|in|do|return|continue|break|switch|case|default|goto|throw|try|catch|finally|lock|yield|await)\\b",
           "name": "meta.class.body.cs"
         }
       ]
@@ -563,4 +563,4 @@
       "name": "storage.modifier.cs"
     }
   }
-}
+}