Skip to content

Commit 4e2bce0

Browse files
Merge pull request #1183 from DustinCampbell/update-grammar
Take latest C# TextMate grammar, fixing a few bugs
2 parents 3487872 + 25a394a commit 4e2bce0

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

syntaxes/csharp.tmLanguage

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1324,6 +1324,10 @@
13241324
<key>include</key>
13251325
<string>#punctuation-comma</string>
13261326
</dict>
1327+
<dict>
1328+
<key>include</key>
1329+
<string>#preprocessor</string>
1330+
</dict>
13271331
</array>
13281332
</dict>
13291333
<key>generic-constraints</key>
@@ -2246,7 +2250,7 @@
22462250
</dict>
22472251
</dict>
22482252
<key>end</key>
2249-
<string>(?=[,\);}])</string>
2253+
<string>(?=[,\)\];}])</string>
22502254
<key>patterns</key>
22512255
<array>
22522256
<dict>
@@ -4869,7 +4873,7 @@
48694873
</dict>
48704874
<dict>
48714875
<key>match</key>
4872-
<string>\s+([_[:alpha:]][_[:alnum:]]*)\s*(?=[,\]])</string>
4876+
<string>\s+([_[:alpha:]][_[:alnum:]]*)\s*(?=[=,\]])</string>
48734877
<key>captures</key>
48744878
<dict>
48754879
<key>1</key>
@@ -4935,7 +4939,7 @@
49354939
</dict>
49364940
<dict>
49374941
<key>match</key>
4938-
<string>\s+([_[:alpha:]][_[:alnum:]]*)\s*(?=[,)])</string>
4942+
<string>\b([_[:alpha:]][_[:alnum:]]*)\s*(?=[=,)])</string>
49394943
<key>captures</key>
49404944
<dict>
49414945
<key>1</key>
@@ -5532,7 +5536,7 @@
55325536
</dict>
55335537
</dict>
55345538
<key>end</key>
5535-
<string>(?=\)|;)</string>
5539+
<string>(?=\)|;|})</string>
55365540
<key>patterns</key>
55375541
<array>
55385542
<dict>
@@ -5575,7 +5579,7 @@
55755579
</dict>
55765580
</dict>
55775581
<key>end</key>
5578-
<string>(?=\)|;)</string>
5582+
<string>(?=\)|;|})</string>
55795583
<key>patterns</key>
55805584
<array>
55815585
<dict>
@@ -5607,7 +5611,7 @@
56075611
</dict>
56085612
</dict>
56095613
<key>end</key>
5610-
<string>(?=\)|;)</string>
5614+
<string>(?=\)|;|})</string>
56115615
<key>patterns</key>
56125616
<array>
56135617
<dict>

0 commit comments

Comments
 (0)