C#: Added with keyword & improved record support (#2993)

Author: RunDevelopment

components/prism-csharp.js

@@ -47,7 +47,7 @@
 		typeDeclaration: 'class enum interface record struct',
 		// contextual keywords
 		// ("var" and "dynamic" are missing because they are used like types)
-		contextual: 'add alias and ascending async await by descending from(?=\\s*(?:\\w|$)) get global group into init(?=\\s*;) join let nameof not notnull on or orderby partial remove select set unmanaged value when where',
+		contextual: 'add alias and ascending async await by descending from(?=\\s*(?:\\w|$)) get global group into init(?=\\s*;) join let nameof not notnull on or orderby partial remove select set unmanaged value when where with(?=\\s*{)',
 		// all other keywords
 		other: 'abstract as base break case catch checked const continue default delegate do else event explicit extern finally fixed for foreach goto if implicit in internal is lock namespace new null operator out override params private protected public readonly ref return sealed sizeof stackalloc static switch this throw try typeof unchecked unsafe using virtual volatile while yield'
 	};
@@ -158,7 +158,7 @@
 			{
 				// Variable, field and parameter declaration
 				// (Foo bar, Bar baz, Foo[,,] bay, Foo<Bar, FooBar<Bar>> bax)
-				pattern: re(/\b<<0>>(?=\s+(?!<<1>>)<<2>>(?:\s*[=,;:{)\]]|\s+(?:in|when)\b))/.source, [typeExpression, nonContextualKeywords, name]),
+				pattern: re(/\b<<0>>(?=\s+(?!<<1>>|with\s*\{)<<2>>(?:\s*[=,;:{)\]]|\s+(?:in|when)\b))/.source, [typeExpression, nonContextualKeywords, name]),
 				inside: typeInside
 			}
 		],
@@ -239,18 +239,24 @@
 			// class Foo<F> : Bar, IList<FooBar>
 			// where F : Bar, IList<int>
 			pattern: re(
-				/\b((?:<<0>>\s+<<1>>|where\s+<<2>>)\s*:\s*)(?:<<3>>|<<4>>)(?:\s*,\s*(?:<<3>>|<<4>>))*(?=\s*(?:where|[{;]|=>|$))/.source,
-				[typeDeclarationKeywords, genericName, name, typeExpression, keywords.source]
+				/\b((?:<<0>>\s+<<1>>|record\s+<<1>>\s*<<5>>|where\s+<<2>>)\s*:\s*)(?:<<3>>|<<4>>|<<1>>\s*<<5>>|<<6>>)(?:\s*,\s*(?:<<3>>|<<4>>|<<6>>))*(?=\s*(?:where|[{;]|=>|$))/.source,
+				[typeDeclarationKeywords, genericName, name, typeExpression, keywords.source, nestedRound, /\bnew\s*\(\s*\)/.source]
 			),
 			lookbehind: true,
 			inside: {
+				'record-arguments': {
+					pattern: re(/(^(?!new\s*\()<<0>>\s*)<<1>>/.source, [genericName, nestedRound]),
+					lookbehind: true,
+					greedy: true,
+					inside: Prism.languages.csharp
+				},
 				'keyword': keywords,
 				'class-name': {
 					pattern: RegExp(typeExpression),
 					greedy: true,
 					inside: typeInside
 				},
-				'punctuation': /,/
+				'punctuation': /[,()]/
 			}
 		},
 		'preprocessor': {

components/prism-csharp.min.js

@@ -2,8 +2,12 @@ class Foo
 interface BarBaz
 struct Foo
 enum Foo
+record Foo
 class Foo<A, B>
 interface Bar<out T>
+record Foo<A, B>
+
+record TestData(string Name);
 
 // not variables
 public static RGBColor FromRainbow(Rainbow colorBand) =>
@@ -28,6 +32,9 @@ public static RGBColor FromRainbow(Rainbow colorBand) =>
 	["keyword", "enum"],
 	["class-name", ["Foo"]],
 
+	["keyword", "record"],
+	["class-name", ["Foo"]],
+
 	["keyword", "class"],
 	["class-name", [
 		"Foo",
@@ -47,6 +54,26 @@ public static RGBColor FromRainbow(Rainbow colorBand) =>
 		["punctuation", ">"]
 	]],
 
+	["keyword", "record"],
+	["class-name", [
+		"Foo",
+		["punctuation", "<"],
+		"A",
+		["punctuation", ","],
+		" B",
+		["punctuation", ">"]
+	]],
+
+	["keyword", "record"],
+	["class-name", ["TestData"]],
+	["punctuation", "("],
+	["class-name", [
+		["keyword", "string"]
+	]],
+	" Name",
+	["punctuation", ")"],
+	["punctuation", ";"],
+
 	["comment", "// not variables"],
 
 	["keyword", "public"],

tests/languages/csharp/class-name-declaration_feature.test

@@ -108,6 +108,9 @@ where;
 while
 yield
 
+// very contextual keywords:
+Person person2 = person1 with { FirstName = "John" };
+
 ----------------------------------------------------
 
 [
@@ -219,7 +222,21 @@ yield
 	["keyword", "when"],
 	["keyword", "where"], ["punctuation", ";"],
 	["keyword", "while"],
-	["keyword", "yield"]
+	["keyword", "yield"],
+
+	["comment", "// very contextual keywords:"],
+
+	["class-name", ["Person"]],
+	" person2 ",
+	["operator", "="],
+	" person1 ",
+	["keyword", "with"],
+	["punctuation", "{"],
+	" FirstName ",
+	["operator", "="],
+	["string", "\"John\""],
+	["punctuation", "}"],
+	["punctuation", ";"]
 ]
 
 ----------------------------------------------------