From 14a3bd38521cd109328faa7f056b4f0b044a4c24 Mon Sep 17 00:00:00 2001 From: David Briscoe Date: Wed, 27 Jun 2018 10:41:54 -0700 Subject: [PATCH 1/3] Fix case on csModifier's nextgroup Update csModifier to use same case as definition for csClass,csIface. --- syntax/cs.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/cs.vim b/syntax/cs.vim index 6977256..dfbe761 100644 --- a/syntax/cs.vim +++ b/syntax/cs.vim @@ -30,7 +30,7 @@ syn match csGlobal display +global::+ " user labels (see [1] 8.6 Statements) syn match csLabel display +^\s*\I\i*\s*:\([^:]\)\@=+ " modifier -syn keyword csModifier abstract const extern internal override private protected public readonly sealed static virtual volatile nextgroup=CsClass,CsIface skipwhite +syn keyword csModifier abstract const extern internal override private protected public readonly sealed static virtual volatile nextgroup=csClass,csIface skipwhite " constant syn keyword csConstant false null true " exception From 43b76545b5fb83ae3c01eee71e497f3c2e05094a Mon Sep 17 00:00:00 2001 From: David Briscoe Date: Wed, 27 Jun 2018 10:41:54 -0700 Subject: [PATCH 2/3] Align definitions Align definitions of csGlobal and csContextualStatement to match other statements. --- syntax/cs.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/syntax/cs.vim b/syntax/cs.vim index dfbe761..1154757 100644 --- a/syntax/cs.vim +++ b/syntax/cs.vim @@ -26,7 +26,7 @@ syn keyword csConditional else if switch syn keyword csLabel case default " :: is usually an error in C#, except for the special case of "global::" syn match csOperatorError display +::+ -syn match csGlobal display +global::+ +syn match csGlobal display +global::+ " user labels (see [1] 8.6 Statements) syn match csLabel display +^\s*\I\i*\s*:\([^:]\)\@=+ " modifier @@ -56,7 +56,7 @@ syn match csContextualStatement /\[^:]\+:/me=s+5 +syn match csContextualStatement /\[^:]\+:/me=s+5 "New Declerations syn keyword csNewDecleration new nextgroup=csClass skipwhite From 5e9ff03cfccdc20d3b8a1d67c1b62e14cd7a9102 Mon Sep 17 00:00:00 2001 From: David Briscoe Date: Wed, 27 Jun 2018 10:41:54 -0700 Subject: [PATCH 3/3] Sort linq keywords csLinq keywords are sorted by name, but otherwise unchanged. --- syntax/cs.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/cs.vim b/syntax/cs.vim index 1154757..3380c45 100644 --- a/syntax/cs.vim +++ b/syntax/cs.vim @@ -46,7 +46,7 @@ syn keyword csUnspecifiedKeyword explicit implicit syn keyword csTypeOf typeof nextgroup=csEnclosed " Linq Keywords -syn keyword csLinq from where select group into orderby join let in on equals by ascending descending +syn keyword csLinq ascending by descending equals from group in into join let on orderby select where " Async Keywords syn keyword csAsync async await