diff options
| author | albertjan <albertjan@curit.com> | 2012-01-31 10:24:58 +0100 |
|---|---|---|
| committer | albertjan <albertjan@curit.com> | 2012-01-31 10:24:58 +0100 |
| commit | 11442332719b604f87de19613822b09783081c2a (patch) | |
| tree | ddf707d38b775522e3eb75fb33e53e8d59de740a /pygments/lexers/dotnet.py | |
| parent | d1d4877628fa06d7c9e0af9d411e0d301b808374 (diff) | |
| download | pygments-11442332719b604f87de19613822b09783081c2a.tar.gz | |
Changes to dotnet.py lexer to fix rendering issues with verbatimstrings. And also adds a
few new keywords and types for c#.
Diffstat (limited to 'pygments/lexers/dotnet.py')
| -rw-r--r-- | pygments/lexers/dotnet.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pygments/lexers/dotnet.py b/pygments/lexers/dotnet.py index 16c424f4..c1c96a70 100644 --- a/pygments/lexers/dotnet.py +++ b/pygments/lexers/dotnet.py @@ -92,7 +92,7 @@ class CSharpLexer(RegexLexer): (r'\n', Text), (r'[~!%^&*()+=|\[\]:;,.<>/?-]', Punctuation), (r'[{}]', Punctuation), - (r'@"(\\\\|\\"|[^"])*"', String), + (r'@"(""|[^"])*"', String), (r'"(\\\\|\\"|[^"\n])*["\n]', String), (r"'\\.'|'[^\\]'", String.Char), (r"[0-9](\.[0-9]*)?([eE][+-][0-9]+)?" @@ -111,10 +111,12 @@ class CSharpLexer(RegexLexer): r'ref|return|sealed|sizeof|stackalloc|static|' r'switch|this|throw|true|try|typeof|' r'unchecked|unsafe|virtual|void|while|' - r'get|set|new|partial|yield|add|remove|value)\b', Keyword), + r'get|set|new|partial|yield|add|remove|value|alias|ascending|' + r'descending|from|group|into|orderby|select|where|' + r'join|equals)\b', Keyword), (r'(global)(::)', bygroups(Keyword, Punctuation)), - (r'(bool|byte|char|decimal|double|float|int|long|object|sbyte|' - r'short|string|uint|ulong|ushort)\b\??', Keyword.Type), + (r'(bool|byte|char|decimal|double|dynamic|float|int|long|object|' + r'sbyte|short|string|uint|ulong|ushort|var)\b\??', Keyword.Type), (r'(class|struct)(\s+)', bygroups(Keyword, Text), 'class'), (r'(namespace|using)(\s+)', bygroups(Keyword, Text), 'namespace'), (cs_ident, Name), |