@codingame/monaco-editor-wrapper 1.1.5 → 1.2.0

package/dist/aspnetcorerazor.tmLanguage.js

@@ -61,6 +61,7 @@ var repository = {
 				name: "keyword.control.razor.directive.codeblock.open"
 			}
 		},
+		contentName: "source.cs",
 		patterns: [
 			{
 				include: "#razor-codeblock-body"
@@ -119,10 +120,10 @@ var repository = {
 		},
 		patterns: [
 			{
-				include: "#balanced-open-close-tag-body"
+				include: "#wellformed-html"
 			},
 			{
-				include: "#wellformed-html"
+				include: "$self"
 			}
 		],
 		end: "(</text>)",
@@ -168,13 +169,13 @@ var repository = {
 				include: "#void-tag"
 			},
 			{
-				include: "#balanced-open-close-tag"
+				include: "#non-void-tag"
 			}
 		]
 	},
 	"void-tag": {
 		name: "meta.tag.structure.$3.void.html",
-		begin: "(?i)(<)(!?)(area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)(?=\\s|/?>)",
+		begin: "(?i)(<)(!)?(area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)(?=\\s|/?>)",
 		beginCaptures: {
 			"1": {
 				name: "punctuation.definition.tag.begin.html"
@@ -198,86 +199,65 @@ var repository = {
 			}
 		}
 	},
-	"balanced-open-close-tag": {
-		begin: "(?=<([^/\\s>]+))",
-		patterns: [
-			{
-				include: "#balanced-open-close-tag-start"
-			},
-			{
-				include: "#balanced-open-close-tag-end"
-			},
-			{
-				include: "#balanced-open-close-tag-body"
-			}
-		],
-		end: "(?<=(</\\1>))|(/>)"
-	},
-	"balanced-open-close-tag-start": {
-		begin: "(<)(?!(/))([^/\\s>]+)",
-		beginCaptures: {
+	"non-void-tag": {
+		begin: "(?=<(!)?([^/\\s>]+)(\\s|/?>))",
+		end: "(</)(\\2)\\s*(>)|(/>)",
+		endCaptures: {
 			"1": {
 				name: "punctuation.definition.tag.begin.html"
 			},
 			"2": {
-				name: "constant.character.escape.razor.tagHelperOptOut"
+				name: "entity.name.tag.html"
 			},
 			"3": {
-				name: "entity.name.tag.html"
-			}
-		},
-		patterns: [
-			{
-				include: "#balanced-open-close-tag-attributes"
-			}
-		],
-		end: "/?>",
-		endCaptures: {
-			"0": {
 				name: "punctuation.definition.tag.end.html"
-			}
-		}
-	},
-	"balanced-open-close-tag-attributes": {
-		begin: "(?=\\s)",
-		patterns: [
-			{
-				include: "#razor-control-structures"
 			},
-			{
-				include: "text.html.basic#attribute"
+			"4": {
+				name: "punctuation.definition.tag.end.html"
 			}
-		],
-		end: "(?=/?>)"
-	},
-	"balanced-open-close-tag-body": {
-		begin: "(?<=([^/])>)",
+		},
 		patterns: [
 			{
-				include: "#wellformed-html"
+				begin: "(<)(!)?([^/\\s>]+)(?=\\s|/?>)",
+				beginCaptures: {
+					"1": {
+						name: "punctuation.definition.tag.begin.html"
+					},
+					"2": {
+						name: "constant.character.escape.razor.tagHelperOptOut"
+					},
+					"3": {
+						name: "entity.name.tag.html"
+					}
+				},
+				end: "(?=/?>)",
+				patterns: [
+					{
+						include: "#razor-control-structures"
+					},
+					{
+						include: "text.html.basic#attribute"
+					}
+				]
 			},
 			{
-				include: "$self"
-			}
-		],
-		end: "(?=\\</)"
-	},
-	"balanced-open-close-tag-end": {
-		match: "(</)(!?)([^/\\s>]+)\\s*(>)",
-		captures: {
-			"1": {
-				name: "punctuation.definition.tag.begin.html"
-			},
-			"2": {
-				name: "constant.character.escape.razor.tagHelperOptOut"
-			},
-			"3": {
-				name: "entity.name.tag.html"
-			},
-			"4": {
-				name: "punctuation.definition.tag.end.html"
+				begin: ">",
+				beginCaptures: {
+					"0": {
+						name: "punctuation.definition.tag.end.html"
+					}
+				},
+				end: "(?=</)",
+				patterns: [
+					{
+						include: "#wellformed-html"
+					},
+					{
+						include: "$self"
+					}
+				]
 			}
-		}
+		]
 	},
 	"explicit-razor-expression": {
 		name: "meta.expression.explicit.cshtml",
@@ -308,6 +288,7 @@ var repository = {
 	},
 	"implicit-expression": {
 		name: "meta.expression.implicit.cshtml",
+		contentName: "source.cs",
 		begin: "(?<![[:alpha:][:alnum:]])(@)",
 		beginCaptures: {
 			"1": {
@@ -571,6 +552,7 @@ var repository = {
 			}
 		},
 		name: "meta.structure.razor.directive.codeblock",
+		contentName: "source.cs",
 		patterns: [
 			{
 				include: "source.cs"
@@ -584,7 +566,7 @@ var repository = {
 		}
 	},
 	"page-directive": {
-		name: "meta.directive.page.cshtml",
+		name: "meta.directive",
 		match: "(@)(page)\\s+([^$]+)?",
 		captures: {
 			"1": {
@@ -607,7 +589,7 @@ var repository = {
 		}
 	},
 	"addTagHelper-directive": {
-		name: "meta.directive.addTagHelper.razor",
+		name: "meta.directive",
 		match: "(@)(addTagHelper)\\s+([^$]+)?",
 		captures: {
 			"1": {
@@ -630,7 +612,7 @@ var repository = {
 		}
 	},
 	"removeTagHelper-directive": {
-		name: "meta.directive.removeTagHelper.razor",
+		name: "meta.directive",
 		match: "(@)(removeTagHelper)\\s+([^$]+)?",
 		captures: {
 			"1": {
@@ -653,7 +635,7 @@ var repository = {
 		}
 	},
 	"tagHelperPrefix-directive": {
-		name: "meta.directive.tagHelperPrefix.razor",
+		name: "meta.directive",
 		match: "(@)(tagHelperPrefix)\\s+([^$]+)?",
 		captures: {
 			"1": {
@@ -690,7 +672,7 @@ var repository = {
 		match: "[^$]+"
 	},
 	"model-directive": {
-		name: "meta.directive.model.cshtml",
+		name: "meta.directive",
 		match: "(@)(model)\\s+([^$]+)?",
 		captures: {
 			"1": {
@@ -713,7 +695,7 @@ var repository = {
 		}
 	},
 	"inherits-directive": {
-		name: "meta.directive.inherits.cshtml",
+		name: "meta.directive",
 		match: "(@)(inherits)\\s+([^$]+)?",
 		captures: {
 			"1": {
@@ -736,7 +718,7 @@ var repository = {
 		}
 	},
 	"implements-directive": {
-		name: "meta.directive.implements.razor",
+		name: "meta.directive",
 		match: "(@)(implements)\\s+([^$]+)?",
 		captures: {
 			"1": {
@@ -759,7 +741,7 @@ var repository = {
 		}
 	},
 	"layout-directive": {
-		name: "meta.directive.layout.razor",
+		name: "meta.directive",
 		match: "(@)(layout)\\s+([^$]+)?",
 		captures: {
 			"1": {
@@ -782,7 +764,7 @@ var repository = {
 		}
 	},
 	"namespace-directive": {
-		name: "meta.directive.namespace.razor",
+		name: "meta.directive",
 		match: "(@)(namespace)\\s+([^\\s]+)?",
 		captures: {
 			"1": {
@@ -816,7 +798,7 @@ var repository = {
 		}
 	},
 	"inject-directive": {
-		name: "meta.directive.inject.cshtml",
+		name: "meta.directive",
 		match: "(@)(inject)\\s*([\\S\\s]+?)?\\s*([_[:alpha:]][_[:alnum:]]*)?\\s*(?=$)",
 		captures: {
 			"1": {
@@ -842,7 +824,7 @@ var repository = {
 		}
 	},
 	"attribute-directive": {
-		name: "meta.directive.attribute.razor",
+		name: "meta.directive",
 		begin: "(@)(attribute)\\b\\s+",
 		beginCaptures: {
 			"1": {
@@ -864,7 +846,7 @@ var repository = {
 		end: "(?<=\\])|$"
 	},
 	"section-directive": {
-		name: "meta.directive.section.razor",
+		name: "meta.directive.block",
 		begin: "(@)(section)\\b\\s+([_[:alpha:]][_[:alnum:]]*)?",
 		beginCaptures: {
 			"1": {
@@ -909,7 +891,7 @@ var repository = {
 		}
 	},
 	"using-directive": {
-		name: "meta.directive.using.cshtml",
+		name: "meta.directive",
 		match: "(@)(using)\\b\\s+(?!\\(|\\s)(.+?)?(;)?$",
 		captures: {
 			"1": {

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"
 			},
@@ -1550,14 +1585,6 @@ var repository = {
 			}
 		]
 	},
-	"unit-test": {
-		patterns: [
-			{
-				match: "\\bunittest\\b",
-				name: "entity.name.function.unit-test.d"
-			}
-		]
-	},
 	"shared-static-constructor": {
 		patterns: [
 			{
@@ -1668,26 +1695,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 +2087,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: [
 			{