@codingame/monaco-editor-wrapper 1.1.5 → 1.4.0

package/dist/d2.js

@@ -30,6 +30,18 @@ var repository = {
 			},
 			{
 				include: "#type-ctor"
+			},
+			{
+				begin: "!\\(",
+				end: "\\)",
+				patterns: [
+					{
+						include: "#type"
+					},
+					{
+						include: "#expression"
+					}
+				]
 			}
 		]
 	},
@@ -47,6 +59,10 @@ var repository = {
 	},
 	"extended-type": {
 		patterns: [
+			{
+				match: "\\b((\\.\\s*)?[_\\w][_\\d\\w]*)(\\s*\\.\\s*[_\\w][_\\d\\w]*)*\\b",
+				name: "entity.name.type.d"
+			},
 			{
 				begin: "\\[",
 				beginCaptures: {
@@ -201,7 +217,7 @@ var repository = {
 		patterns: [
 			{
 				match: "\\s(\\?|:)\\s",
-				name: "keyword.operator.expression.d"
+				name: "keyword.operator.ternary.d"
 			}
 		]
 	},
@@ -283,21 +299,27 @@ var repository = {
 	"cast-expression": {
 		patterns: [
 			{
-				begin: "\\bcast\\s*\\(",
+				begin: "\\b(cast)\\s*(\\()",
 				beginCaptures: {
-					"0": {
-						name: "support.type.cast.begin.d"
+					"1": {
+						name: "keyword.operator.cast.d"
+					},
+					"2": {
+						name: "keyword.operator.cast.begin.d"
 					}
 				},
 				end: "\\)",
 				endCaptures: {
 					"0": {
-						name: "support.type.cast.end.d"
+						name: "keyword.operator.cast.end.d"
 					}
 				},
 				patterns: [
 					{
 						include: "#type"
+					},
+					{
+						include: "#extended-type"
 					}
 				]
 			}
@@ -322,9 +344,6 @@ var repository = {
 	},
 	"function-literal": {
 		patterns: [
-			{
-				include: "#lambda-expression"
-			},
 			{
 				match: "=>",
 				name: "keyword.operator.lambda.d"
@@ -332,11 +351,7 @@ var repository = {
 			{
 				match: "\\b(function|delegate)\\b",
 				name: "keyword.other.function-literal.d"
-			}
-		]
-	},
-	"lambda-expression": {
-		patterns: [
+			},
 			{
 				begin: "\\b([_\\w][_\\d\\w]*)\\s*(=>)",
 				end: "(?=[\\);,\\]}])",
@@ -353,6 +368,23 @@ var repository = {
 						include: "source.d"
 					}
 				]
+			},
+			{
+				begin: "(?<=\\)|\\()(\\s*)({)",
+				beginCaptures: {
+					"1": {
+						name: "source.d"
+					},
+					"2": {
+						name: "source.d"
+					}
+				},
+				end: "}",
+				patterns: [
+					{
+						include: "source.d"
+					}
+				]
 			}
 		]
 	},
@@ -557,6 +589,9 @@ var repository = {
 			{
 				include: "#for-statement"
 			},
+			{
+				include: "#static-foreach"
+			},
 			{
 				include: "#foreach-statement"
 			},
@@ -1340,9 +1375,6 @@ var repository = {
 			},
 			{
 				include: "#function-prelude"
-			},
-			{
-				include: "#function-parameters"
 			}
 		]
 	},
@@ -1354,17 +1386,6 @@ var repository = {
 			}
 		]
 	},
-	"function-parameters": {
-		begin: "\\((?=.*\\)\\s*(\\{|=>))",
-		beginCaptures: "entity.name.function.d",
-		end: "\\)",
-		endCaptures: "entity.name.function.d",
-		patterns: [
-			{
-				include: "#parameters"
-			}
-		]
-	},
 	"class-members": {
 		patterns: [
 			{
@@ -1390,56 +1411,6 @@ var repository = {
 			}
 		]
 	},
-	parameters: {
-		patterns: [
-			{
-				match: ",",
-				name: "keyword.operator.comma.d"
-			},
-			{
-				include: "#comment"
-			},
-			{
-				include: "#parameter"
-			}
-		]
-	},
-	parameter: {
-		patterns: [
-			{
-				include: "#in-out"
-			},
-			{
-				include: "#type"
-			},
-			{
-				include: "#function-literal"
-			},
-			{
-				match: "\\.\\.\\.",
-				name: "support.type.tuple.d"
-			},
-			{
-				match: "\\b[R-Z]([0-9])?\\b",
-				name: "variable.parameter.d"
-			},
-			{
-				match: "\\b(\\.?[_\\w][_\\d\\w]*)+\\b",
-				name: "variable.parameter.d"
-			},
-			{
-				include: "#lexical"
-			}
-		]
-	},
-	"in-out": {
-		patterns: [
-			{
-				match: "\\b(auto|final|in|out|lazy|ref|scope)\\b",
-				name: "storage.type.modifier.inout.d"
-			}
-		]
-	},
 	"function-attribute": {
 		patterns: [
 			{
@@ -1550,14 +1521,6 @@ var repository = {
 			}
 		]
 	},
-	"unit-test": {
-		patterns: [
-			{
-				match: "\\bunittest\\b",
-				name: "entity.name.function.unit-test.d"
-			}
-		]
-	},
 	"shared-static-constructor": {
 		patterns: [
 			{
@@ -1668,26 +1631,33 @@ var repository = {
 	"enum-declaration": {
 		patterns: [
 			{
-				match: "\\b(enum)(?:\\s+([A-Za-z_][\\w_\\d]*))?\\b",
-				captures: {
+				begin: "\\b(enum)\\b\\s+",
+				end: "([A-Za-z_][\\w_\\d]*)\\s*(?=;|=|\\()(;)?",
+				beginCaptures: {
 					"1": {
 						name: "storage.type.enum.d"
-					},
-					"2": {
-						name: "entity.name.type.enum.d"
 					}
-				}
-			},
-			{
-				match: "\\b(enum)\\b\\s+([A-Za-z_][\\w_\\d]*)\\s*(?=;|=)",
-				captures: {
+				},
+				endCaptures: {
 					"1": {
-						name: "storage.type.enum.d"
+						name: "entity.name.type.enum.d"
 					},
 					"2": {
-						name: "entity.name.type.enum.d"
+						name: "meta.enum.end.d"
 					}
-				}
+				},
+				patterns: [
+					{
+						include: "#type"
+					},
+					{
+						include: "#extended-type"
+					},
+					{
+						match: "=(?![=>])",
+						name: "keyword.operator.equal.alias.d"
+					}
+				]
 			}
 		]
 	},
@@ -2053,6 +2023,30 @@ var repository = {
 			}
 		]
 	},
+	"static-foreach": {
+		patterns: [
+			{
+				begin: "\\b(static\\s+foreach)\\b\\s*",
+				captures: {
+					"1": {
+						name: "keyword.control.static-foreach.d"
+					}
+				},
+				end: "(?<=\\))",
+				patterns: [
+					{
+						begin: "\\(",
+						end: "\\)",
+						patterns: [
+							{
+								include: "source.d"
+							}
+						]
+					}
+				]
+			}
+		]
+	},
 	module: {
 		packages: [
 			{