Commit 4cb9888d8145e94b700646e80a6296f40e6c617a
2018-03-05T08:22:53
C#: Reorder keywords
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278
diff --git a/components/prism-csharp.js b/components/prism-csharp.js
index 12cf7ff..b170b3e 100644
--- a/components/prism-csharp.js
+++ b/components/prism-csharp.js
@@ -1,5 +1,5 @@
Prism.languages.csharp = Prism.languages.extend('clike', {
- 'keyword': /\b(abstract|as|async|await|base|bool|break|byte|case|catch|char|checked|class|const|continue|decimal|default|delegate|do|double|else|enum|event|explicit|extern|false|finally|fixed|float|for|foreach|goto|if|implicit|in|int|interface|internal|is|lock|long|namespace|new|null|object|operator|out|override|params|private|protected|public|readonly|ref|return|sbyte|sealed|short|sizeof|stackalloc|static|string|struct|switch|this|throw|true|try|typeof|uint|ulong|unchecked|unsafe|ushort|using|virtual|void|volatile|while|add|alias|ascending|async|await|descending|dynamic|from|get|global|group|into|join|let|orderby|partial|remove|select|set|value|var|where|yield)\b/,
+ 'keyword': /\b(?:abstract|add|alias|as|ascending|async|await|base|bool|break|byte|case|catch|char|checked|class|const|continue|decimal|default|delegate|descending|do|double|dynamic|else|enum|event|explicit|extern|false|finally|fixed|float|for|foreach|from|get|global|goto|group|if|implicit|in|int|interface|internal|into|is|join|let|lock|long|namespace|new|null|object|operator|orderby|out|override|params|partial|private|protected|public|readonly|ref|remove|return|sbyte|sealed|select|set|short|sizeof|stackalloc|static|string|struct|switch|this|throw|true|try|typeof|uint|ulong|unchecked|unsafe|ushort|using|value|var|virtual|void|volatile|where|while|yield)\b/,
'string': [
{
pattern: /@("|')(?:\1\1|\\[\s\S]|(?!\1)[^\\])*\1/,
diff --git a/components/prism-csharp.min.js b/components/prism-csharp.min.js
index 2bc70db..249f31f 100644
--- a/components/prism-csharp.min.js
+++ b/components/prism-csharp.min.js
@@ -1 +1 @@
-Prism.languages.csharp=Prism.languages.extend("clike",{keyword:/\b(abstract|as|async|await|base|bool|break|byte|case|catch|char|checked|class|const|continue|decimal|default|delegate|do|double|else|enum|event|explicit|extern|false|finally|fixed|float|for|foreach|goto|if|implicit|in|int|interface|internal|is|lock|long|namespace|new|null|object|operator|out|override|params|private|protected|public|readonly|ref|return|sbyte|sealed|short|sizeof|stackalloc|static|string|struct|switch|this|throw|true|try|typeof|uint|ulong|unchecked|unsafe|ushort|using|virtual|void|volatile|while|add|alias|ascending|async|await|descending|dynamic|from|get|global|group|into|join|let|orderby|partial|remove|select|set|value|var|where|yield)\b/,string:[{pattern:/@("|')(?:\1\1|\\[\s\S]|(?!\1)[^\\])*\1/,greedy:!0},{pattern:/("|')(?:\\.|(?!\1)[^\\\r\n])*?\1/,greedy:!0}],number:/\b-?(?:0x[\da-f]+|\d*\.?\d+f?)\b/i}),Prism.languages.insertBefore("csharp","keyword",{"generic-method":{pattern:/[a-z0-9_]+\s*<[^>\r\n]+?>\s*(?=\()/i,alias:"function",inside:{keyword:Prism.languages.csharp.keyword,punctuation:/[<>(),.:]/}},preprocessor:{pattern:/(^\s*)#.*/m,lookbehind:!0,alias:"property",inside:{directive:{pattern:/(\s*#)\b(?:define|elif|else|endif|endregion|error|if|line|pragma|region|undef|warning)\b/,lookbehind:!0,alias:"keyword"}}}});
\ No newline at end of file
+Prism.languages.csharp=Prism.languages.extend("clike",{keyword:/\b(?:abstract|add|alias|as|ascending|async|await|base|bool|break|byte|case|catch|char|checked|class|const|continue|decimal|default|delegate|descending|do|double|dynamic|else|enum|event|explicit|extern|false|finally|fixed|float|for|foreach|from|get|global|goto|group|if|implicit|in|int|interface|internal|into|is|join|let|lock|long|namespace|new|null|object|operator|orderby|out|override|params|partial|private|protected|public|readonly|ref|remove|return|sbyte|sealed|select|set|short|sizeof|stackalloc|static|string|struct|switch|this|throw|true|try|typeof|uint|ulong|unchecked|unsafe|ushort|using|value|var|virtual|void|volatile|where|while|yield)\b/,string:[{pattern:/@("|')(?:\1\1|\\[\s\S]|(?!\1)[^\\])*\1/,greedy:!0},{pattern:/("|')(?:\\.|(?!\1)[^\\\r\n])*?\1/,greedy:!0}],number:/\b-?(?:0x[\da-f]+|\d*\.?\d+f?)\b/i}),Prism.languages.insertBefore("csharp","keyword",{"generic-method":{pattern:/[a-z0-9_]+\s*<[^>\r\n]+?>\s*(?=\()/i,alias:"function",inside:{keyword:Prism.languages.csharp.keyword,punctuation:/[<>(),.:]/}},preprocessor:{pattern:/(^\s*)#.*/m,lookbehind:!0,alias:"property",inside:{directive:{pattern:/(\s*#)\b(?:define|elif|else|endif|endregion|error|if|line|pragma|region|undef|warning)\b/,lookbehind:!0,alias:"keyword"}}}});
\ No newline at end of file
diff --git a/tests/languages/csharp/keyword_feature.test b/tests/languages/csharp/keyword_feature.test
index 1a729bc..e1c37f0 100644
--- a/tests/languages/csharp/keyword_feature.test
+++ b/tests/languages/csharp/keyword_feature.test
@@ -1,61 +1,207 @@
-abstract as async await base
-bool break byte case catch
-char checked
+abstract
+add
+alias
+as
+ascending
+async
+await
+base
+bool
+break
+byte
+case
+catch
+char
+checked
class;
-const continue
-decimal default delegate do
-double else enum event explicit
-extern false finally fixed float
-for foreach goto if implicit in
+const
+continue
+decimal
+default
+delegate
+descending
+do
+double
+dynamic
+else
+enum
+event
+explicit
+extern
+false
+finally
+fixed
+float
+for
+foreach
+from
+get
+global
+goto
+group
+if
+implicit
+in
int
interface;
-internal is lock
-long namespace
+internal
+into
+is
+join
+let
+lock
+long
+namespace
new;
-null object
-operator out override params
-private protected public readonly
-ref return sbyte sealed short
-sizeof stackalloc static string
-struct switch this throw true
-try typeof uint ulong unchecked
-unsafe ushort using virtual void
-volatile while add alias ascending
-async await descending dynamic
-from get global group into
-join let orderby partial remove
-select set value var where yield
+null
+object
+operator
+orderby
+out
+override
+params
+partial
+private
+protected
+public
+readonly
+ref
+remove
+return
+sbyte
+sealed
+select
+set
+short
+sizeof
+stackalloc
+static
+string
+struct
+switch
+this
+throw
+true
+try
+typeof
+uint
+ulong
+unchecked
+unsafe
+ushort
+using
+value
+var
+virtual
+void
+volatile
+where
+while
+yield
----------------------------------------------------
[
- ["keyword", "abstract"], ["keyword", "as"], ["keyword", "async"], ["keyword", "await"], ["keyword", "base"],
- ["keyword", "bool"], ["keyword", "break"], ["keyword", "byte"], ["keyword", "case"], ["keyword", "catch"],
- ["keyword", "char"], ["keyword", "checked"],
+ ["keyword", "abstract"],
+ ["keyword", "add"],
+ ["keyword", "alias"],
+ ["keyword", "as"],
+ ["keyword", "ascending"],
+ ["keyword", "async"],
+ ["keyword", "await"],
+ ["keyword", "base"],
+ ["keyword", "bool"],
+ ["keyword", "break"],
+ ["keyword", "byte"],
+ ["keyword", "case"],
+ ["keyword", "catch"],
+ ["keyword", "char"],
+ ["keyword", "checked"],
["keyword", "class"], ["punctuation", ";"],
- ["keyword", "const"], ["keyword", "continue"],
- ["keyword", "decimal"], ["keyword", "default"], ["keyword", "delegate"], ["keyword", "do"],
- ["keyword", "double"], ["keyword", "else"], ["keyword", "enum"], ["keyword", "event"], ["keyword", "explicit"],
- ["keyword", "extern"], ["keyword", "false"], ["keyword", "finally"], ["keyword", "fixed"], ["keyword", "float"],
- ["keyword", "for"], ["keyword", "foreach"], ["keyword", "goto"], ["keyword", "if"], ["keyword", "implicit"], ["keyword", "in"],
+ ["keyword", "const"],
+ ["keyword", "continue"],
+ ["keyword", "decimal"],
+ ["keyword", "default"],
+ ["keyword", "delegate"],
+ ["keyword", "descending"],
+ ["keyword", "do"],
+ ["keyword", "double"],
+ ["keyword", "dynamic"],
+ ["keyword", "else"],
+ ["keyword", "enum"],
+ ["keyword", "event"],
+ ["keyword", "explicit"],
+ ["keyword", "extern"],
+ ["keyword", "false"],
+ ["keyword", "finally"],
+ ["keyword", "fixed"],
+ ["keyword", "float"],
+ ["keyword", "for"],
+ ["keyword", "foreach"],
+ ["keyword", "from"],
+ ["keyword", "get"],
+ ["keyword", "global"],
+ ["keyword", "goto"],
+ ["keyword", "group"],
+ ["keyword", "if"],
+ ["keyword", "implicit"],
+ ["keyword", "in"],
["keyword", "int"],
["keyword", "interface"], ["punctuation", ";"],
- ["keyword", "internal"], ["keyword", "is"], ["keyword", "lock"],
- ["keyword", "long"], ["keyword", "namespace"],
+ ["keyword", "internal"],
+ ["keyword", "into"],
+ ["keyword", "is"],
+ ["keyword", "join"],
+ ["keyword", "let"],
+ ["keyword", "lock"],
+ ["keyword", "long"],
+ ["keyword", "namespace"],
["keyword", "new"], ["punctuation", ";"],
- ["keyword", "null"], ["keyword", "object"],
- ["keyword", "operator"], ["keyword", "out"], ["keyword", "override"], ["keyword", "params"],
- ["keyword", "private"], ["keyword", "protected"], ["keyword", "public"], ["keyword", "readonly"],
- ["keyword", "ref"], ["keyword", "return"], ["keyword", "sbyte"], ["keyword", "sealed"], ["keyword", "short"],
- ["keyword", "sizeof"], ["keyword", "stackalloc"], ["keyword", "static"], ["keyword", "string"],
- ["keyword", "struct"], ["keyword", "switch"], ["keyword", "this"], ["keyword", "throw"], ["keyword", "true"],
- ["keyword", "try"], ["keyword", "typeof"], ["keyword", "uint"], ["keyword", "ulong"], ["keyword", "unchecked"],
- ["keyword", "unsafe"], ["keyword", "ushort"], ["keyword", "using"], ["keyword", "virtual"], ["keyword", "void"],
- ["keyword", "volatile"], ["keyword", "while"], ["keyword", "add"], ["keyword", "alias"], ["keyword", "ascending"],
- ["keyword", "async"], ["keyword", "await"], ["keyword", "descending"], ["keyword", "dynamic"],
- ["keyword", "from"], ["keyword", "get"], ["keyword", "global"], ["keyword", "group"], ["keyword", "into"],
- ["keyword", "join"], ["keyword", "let"], ["keyword", "orderby"], ["keyword", "partial"], ["keyword", "remove"],
- ["keyword", "select"], ["keyword", "set"], ["keyword", "value"], ["keyword", "var"], ["keyword", "where"], ["keyword", "yield"]
+ ["keyword", "null"],
+ ["keyword", "object"],
+ ["keyword", "operator"],
+ ["keyword", "orderby"],
+ ["keyword", "out"],
+ ["keyword", "override"],
+ ["keyword", "params"],
+ ["keyword", "partial"],
+ ["keyword", "private"],
+ ["keyword", "protected"],
+ ["keyword", "public"],
+ ["keyword", "readonly"],
+ ["keyword", "ref"],
+ ["keyword", "remove"],
+ ["keyword", "return"],
+ ["keyword", "sbyte"],
+ ["keyword", "sealed"],
+ ["keyword", "select"],
+ ["keyword", "set"],
+ ["keyword", "short"],
+ ["keyword", "sizeof"],
+ ["keyword", "stackalloc"],
+ ["keyword", "static"],
+ ["keyword", "string"],
+ ["keyword", "struct"],
+ ["keyword", "switch"],
+ ["keyword", "this"],
+ ["keyword", "throw"],
+ ["keyword", "true"],
+ ["keyword", "try"],
+ ["keyword", "typeof"],
+ ["keyword", "uint"],
+ ["keyword", "ulong"],
+ ["keyword", "unchecked"],
+ ["keyword", "unsafe"],
+ ["keyword", "ushort"],
+ ["keyword", "using"],
+ ["keyword", "value"],
+ ["keyword", "var"],
+ ["keyword", "virtual"],
+ ["keyword", "void"],
+ ["keyword", "volatile"],
+ ["keyword", "where"],
+ ["keyword", "while"],
+ ["keyword", "yield"]
]
----------------------------------------------------