@codingame/monaco-editor-wrapper 1.14.4 → 1.14.7

package/dist/omnisharp.js

@@ -361,52 +361,40 @@ var omnisharp = [
         "scope": 3
       },
       "omnisharp.path": {
-        "type": [
-          "string",
-          "null"
-        ],
-        "default": null,
+        "type": "string",
         "scope": 2,
         "description": "Specifies the path to OmniSharp. When left empty the OmniSharp version pinned to the C# Extension is used. This can be the absolute path to an OmniSharp executable, a specific version number, or \"latest\". If a version number or \"latest\" is specified, the appropriate version of OmniSharp will be downloaded on your behalf. Setting \"latest\" is an opt-in into latest beta releases of OmniSharp."
       },
       "omnisharp.useModernNet": {
         "type": "boolean",
-        "default": false,
+        "default": true,
         "scope": 3,
-        "title": "Use .NET 6 build of OmniSharp (experimental)",
-        "description": "Use OmniSharp build for .NET 6. This version _does not_ support non-SDK-style .NET Framework projects, including Unity. SDK-style Framework, .NET Core, and .NET 5+ projects should see significant performance improvements, but there may still be bugs. Please open issues if you find any bugs."
+        "title": "Use .NET 6 build of OmniSharp",
+        "description": "Use OmniSharp build for .NET 6. This version _does not_ support non-SDK-style .NET Framework projects, including Unity. SDK-style Framework, .NET Core, and .NET 5+ projects should see significant performance improvements."
       },
-      "omnisharp.useGlobalMono": {
+      "omnisharp.sdkPath": {
         "type": "string",
-        "default": "auto",
-        "enum": [
-          "auto",
-          "always",
-          "never"
-        ],
-        "enumDescriptions": [
-          "Automatically launch OmniSharp with internal \"mono\", since \"mono\" 6.12.0 does not support .NET Core 3.1.40x or .NET 5 SDKs.",
-          "Always launch OmniSharp with \"mono\". If version 6.4.0 or greater is not available on the PATH, an error will be printed.",
-          "Never launch OmniSharp on a globally-installed Mono."
-        ],
-        "description": "Launch OmniSharp with the globally-installed Mono. If set to \"always\", \"mono\" version 6.4.0 or greater must be available on the PATH. If set to \"auto\", OmniSharp will be launched with \"mono\" if version 6.4.0 or greater is available on the PATH.",
-        "scope": 3
+        "scope": 3,
+        "description": "Specifies the path to a .NET SDK installation to use for project loading instead of the highest version installed. Applies when \"useModernNet\" is set to true. Example: \"/home/username/dotnet/sdks/6.0.300\"."
+      },
+      "omnisharp.sdkVersion": {
+        "type": "string",
+        "scope": 3,
+        "description": "Specifies the version of the .NET SDK to use for project loading instead of the highest version installed. Applies when \"useModernNet\" is set to true. Example: \"6.0.300\"."
+      },
+      "omnisharp.sdkIncludePrereleases": {
+        "type": "boolean",
+        "scope": 3,
+        "default": true,
+        "description": "Specifies whether to include preview versions of the .NET SDK when determining which version to use for project loading. Applies when \"useModernNet\" is set to true."
       },
       "omnisharp.monoPath": {
-        "type": [
-          "string",
-          "null"
-        ],
-        "default": null,
+        "type": "string",
         "scope": 2,
-        "description": "Specifies the path to a mono installation to use when \"useGlobalMono\" is set to \"always\", instead of the default system one. Example: \"/Library/Frameworks/Mono.framework/Versions/Current\""
+        "description": "Specifies the path to a mono installation to use when \"useModernNet\" is set to false, instead of the default system one. Example: \"/Library/Frameworks/Mono.framework/Versions/Current\""
       },
       "omnisharp.dotnetPath": {
-        "type": [
-          "string",
-          "null"
-        ],
-        "default": null,
+        "type": "string",
         "scope": 3,
         "description": "Specified the path to a dotnet installation to use when \"useModernNet\" is set to true, instead of the default system one. Example: \"/home/username/mycustomdotnetdirectory\"."
       },
@@ -450,7 +438,6 @@ var omnisharp = [
       },
       "omnisharp.defaultLaunchSolution": {
         "type": "string",
-        "default": null,
         "description": "The name of the default solution used at start up if the repo has multiple solutions. e.g.'MyAwesomeSolution.sln'. Default value is `null` which will cause the first in alphabetical order to be chosen.",
         "scope": 3
       },
@@ -527,20 +514,12 @@ var omnisharp = [
         "scope": 3
       },
       "omnisharp.testRunSettings": {
-        "type": [
-          "string",
-          "null"
-        ],
-        "default": null,
+        "type": "string",
         "description": "Path to the .runsettings file which should be used when running unit tests.",
         "scope": 3
       },
       "razor.plugin.path": {
-        "type": [
-          "string",
-          "null"
-        ],
-        "default": null,
+        "type": "string",
         "scope": 2,
         "description": "Overrides the path to the Razor plugin dll."
       },
@@ -557,11 +536,7 @@ var omnisharp = [
         "scope": 3
       },
       "razor.languageServer.directory": {
-        "type": [
-          "string",
-          "null"
-        ],
-        "default": null,
+        "type": "string",
         "scope": 2,
         "description": "Overrides the path to the Razor Language Server directory."
       },

package/dist/php.tmLanguage.js

@@ -3,7 +3,7 @@ var information_for_contributors = [
 	"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 	"Once accepted there, we are happy to receive an update request."
 ];
-var version = "https://github.com/atom/language-php/commit/ff64523c94c014d68f5dec189b05557649c5872a";
+var version = "https://github.com/atom/language-php/commit/eb28b8aea1214dcbc732f3d9b9ed20c089c648bd";
 var scopeName = "source.php";
 var patterns = [
 	{
@@ -12,62 +12,6 @@ var patterns = [
 	{
 		include: "#comments"
 	},
-	{
-		begin: "(?i)^\\s*(interface)\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\\s*(extends)?\\s*",
-		beginCaptures: {
-			"1": {
-				name: "storage.type.interface.php"
-			},
-			"2": {
-				name: "entity.name.type.interface.php"
-			},
-			"3": {
-				name: "storage.modifier.extends.php"
-			}
-		},
-		end: "(?i)((?:[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*\\s*,\\s*)*)([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)?\\s*(?:(?={)|$)",
-		endCaptures: {
-			"1": {
-				patterns: [
-					{
-						match: "(?i)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*",
-						name: "entity.other.inherited-class.php"
-					},
-					{
-						match: ",",
-						name: "punctuation.separator.classes.php"
-					}
-				]
-			},
-			"2": {
-				name: "entity.other.inherited-class.php"
-			}
-		},
-		name: "meta.interface.php",
-		patterns: [
-			{
-				include: "#namespace"
-			}
-		]
-	},
-	{
-		begin: "(?i)^\\s*(trait)\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)",
-		beginCaptures: {
-			"1": {
-				name: "storage.type.trait.php"
-			},
-			"2": {
-				name: "entity.name.type.trait.php"
-			}
-		},
-		end: "(?={)",
-		name: "meta.trait.php",
-		patterns: [
-			{
-				include: "#comments"
-			}
-		]
-	},
 	{
 		match: "(?i)(?:^|(?<=<\\?php))\\s*(namespace)\\s+([a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)(?=\\s*;)",
 		name: "meta.namespace.php",
@@ -232,123 +176,214 @@ var patterns = [
 		]
 	},
 	{
-		begin: "(?ix)\n(?:\n  \\b(?:(abstract|final)\\s+)?(class)\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\n  |\\b(new)\\b\\s*(\\#\\[.*\\])?\\s*\\b(class)\\b # anonymous class\n)",
+		begin: "(?ix)\n\\b(trait)\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)",
 		beginCaptures: {
 			"1": {
-				name: "storage.modifier.${1:/downcase}.php"
+				name: "storage.type.trait.php"
 			},
 			"2": {
-				name: "storage.type.class.php"
+				name: "entity.name.type.trait.php"
+			}
+		},
+		end: "}|(?=\\?>)",
+		endCaptures: {
+			"0": {
+				name: "punctuation.definition.trait.end.bracket.curly.php"
+			}
+		},
+		name: "meta.trait.php",
+		patterns: [
+			{
+				include: "#comments"
 			},
-			"3": {
-				name: "entity.name.type.class.php"
+			{
+				begin: "{",
+				beginCaptures: {
+					"0": {
+						name: "punctuation.definition.trait.begin.bracket.curly.php"
+					}
+				},
+				end: "(?=}|\\?>)",
+				contentName: "meta.trait.body.php",
+				patterns: [
+					{
+						include: "$self"
+					}
+				]
+			}
+		]
+	},
+	{
+		begin: "(?ix)\n\\b(interface)\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)",
+		beginCaptures: {
+			"1": {
+				name: "storage.type.interface.php"
 			},
-			"4": {
-				name: "keyword.other.new.php"
+			"2": {
+				name: "entity.name.type.interface.php"
+			}
+		},
+		end: "}|(?=\\?>)",
+		endCaptures: {
+			"0": {
+				name: "punctuation.definition.interface.end.bracket.curly.php"
+			}
+		},
+		name: "meta.interface.php",
+		patterns: [
+			{
+				include: "#comments"
 			},
-			"5": {
+			{
+				include: "#interface-extends"
+			},
+			{
+				begin: "{",
+				beginCaptures: {
+					"0": {
+						name: "punctuation.definition.interface.begin.bracket.curly.php"
+					}
+				},
+				end: "(?=}|\\?>)",
+				contentName: "meta.interface.body.php",
 				patterns: [
 					{
-						include: "#attribute"
+						include: "#class-constant"
+					},
+					{
+						include: "$self"
 					}
 				]
+			}
+		]
+	},
+	{
+		begin: "(?ix)\n\\b(enum)\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\n(?: \\s* (:) \\s* (int | string) \\b )?",
+		beginCaptures: {
+			"1": {
+				name: "storage.type.enum.php"
 			},
-			"6": {
-				name: "storage.type.class.php"
+			"2": {
+				name: "entity.name.type.enum.php"
+			},
+			"3": {
+				name: "keyword.operator.return-value.php"
+			},
+			"4": {
+				name: "keyword.other.type.php"
 			}
 		},
 		end: "}|(?=\\?>)",
 		endCaptures: {
 			"0": {
-				name: "punctuation.definition.class.end.bracket.curly.php"
+				name: "punctuation.definition.enum.end.bracket.curly.php"
 			}
 		},
-		name: "meta.class.php",
+		name: "meta.enum.php",
 		patterns: [
 			{
 				include: "#comments"
 			},
 			{
-				begin: "(?i)(extends)\\s+",
+				include: "#class-implements"
+			},
+			{
+				begin: "{",
 				beginCaptures: {
-					"1": {
-						name: "storage.modifier.extends.php"
+					"0": {
+						name: "punctuation.definition.enum.begin.bracket.curly.php"
 					}
 				},
-				contentName: "meta.other.inherited-class.php",
-				end: "(?i)(?=[^a-z0-9_\\x{7f}-\\x{10ffff}\\\\])",
+				end: "(?=}|\\?>)",
+				contentName: "meta.enum.body.php",
 				patterns: [
 					{
-						begin: "(?i)(?=\\\\?[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*\\\\)",
-						end: "(?i)([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)?(?=[^a-z0-9_\\x{7f}-\\x{10ffff}\\\\])",
-						endCaptures: {
+						match: "(?i)\\b(case)\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)",
+						captures: {
 							"1": {
-								name: "entity.other.inherited-class.php"
-							}
-						},
-						patterns: [
-							{
-								include: "#namespace"
+								name: "storage.modifier.php"
+							},
+							"2": {
+								name: "constant.enum.php"
 							}
-						]
+						}
 					},
 					{
-						include: "#class-builtin"
+						include: "#class-constant"
 					},
 					{
-						include: "#namespace"
-					},
+						include: "$self"
+					}
+				]
+			}
+		]
+	},
+	{
+		begin: "(?ix)\n(?:\n  \\b(?:(abstract|final)\\s+)?(class)\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\n  |\\b(new)\\b\\s*(\\#\\[.*\\])?\\s*\\b(class)\\b # anonymous class\n)",
+		beginCaptures: {
+			"1": {
+				name: "storage.modifier.${1:/downcase}.php"
+			},
+			"2": {
+				name: "storage.type.class.php"
+			},
+			"3": {
+				name: "entity.name.type.class.php"
+			},
+			"4": {
+				name: "keyword.other.new.php"
+			},
+			"5": {
+				patterns: [
 					{
-						match: "(?i)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*",
-						name: "entity.other.inherited-class.php"
+						include: "#attribute"
 					}
 				]
 			},
+			"6": {
+				name: "storage.type.class.php"
+			}
+		},
+		end: "}|(?=\\?>)",
+		endCaptures: {
+			"0": {
+				name: "punctuation.definition.class.end.bracket.curly.php"
+			}
+		},
+		name: "meta.class.php",
+		patterns: [
 			{
-				begin: "(?i)(implements)\\s+",
+				begin: "(?<=class)\\s*(\\()",
 				beginCaptures: {
 					"1": {
-						name: "storage.modifier.implements.php"
+						name: "punctuation.definition.arguments.begin.bracket.round.php"
 					}
 				},
-				end: "(?i)(?=[;{])",
+				end: "\\)|(?=\\?>)",
+				endCaptures: {
+					"0": {
+						name: "punctuation.definition.arguments.end.bracket.round.php"
+					}
+				},
+				name: "meta.function-call.php",
 				patterns: [
 					{
-						include: "#comments"
+						include: "#named-arguments"
 					},
 					{
-						begin: "(?i)(?=[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)",
-						contentName: "meta.other.inherited-class.php",
-						end: "(?i)(?:\\s*(?:,|(?=[^a-z0-9_\\x{7f}-\\x{10ffff}\\\\\\s]))\\s*)",
-						patterns: [
-							{
-								begin: "(?i)(?=\\\\?[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*\\\\)",
-								end: "(?i)([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)?(?=[^a-z0-9_\\x{7f}-\\x{10ffff}\\\\])",
-								endCaptures: {
-									"1": {
-										name: "entity.other.inherited-class.php"
-									}
-								},
-								patterns: [
-									{
-										include: "#namespace"
-									}
-								]
-							},
-							{
-								include: "#class-builtin"
-							},
-							{
-								include: "#namespace"
-							},
-							{
-								match: "(?i)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*",
-								name: "entity.other.inherited-class.php"
-							}
-						]
+						include: "$self"
 					}
 				]
 			},
+			{
+				include: "#comments"
+			},
+			{
+				include: "#class-extends"
+			},
+			{
+				include: "#class-implements"
+			},
 			{
 				begin: "{",
 				beginCaptures: {
@@ -359,6 +394,9 @@ var patterns = [
 				end: "(?=}|\\?>)",
 				contentName: "meta.class.body.php",
 				patterns: [
+					{
+						include: "#class-constant"
+					},
 					{
 						include: "$self"
 					}
@@ -381,7 +419,7 @@ var patterns = [
 		}
 	},
 	{
-		match: "(?x)\n\\s* # FIXME: Removing this causes specs to fail. Investigate.\n\\b(\n  break|case|continue|declare|default|die|do|\n  else(if)?|end(declare|for(each)?|if|switch|while)|exit|\n  for(each)?|if|return|switch|use|while|yield\n)\\b",
+		match: "(?x)\n\\b(\n  break|case|continue|declare|default|die|do|\n  else(if)?|end(declare|for(each)?|if|switch|while)|exit|\n  for(each)?|if|return|switch|use|while|yield\n)\\b",
 		captures: {
 			"1": {
 				name: "keyword.control.${1:/downcase}.php"
@@ -852,7 +890,7 @@ var patterns = [
 		name: "storage.type.php"
 	},
 	{
-		match: "(?i)\\b(global|abstract|const|extends|implements|final|private|protected|public|static)\\b",
+		match: "(?i)\\b(global|abstract|const|final|private|protected|public|static)\\b",
 		name: "storage.modifier.php"
 	},
 	{
@@ -974,7 +1012,7 @@ var patterns = [
 				name: "entity.name.goto-label.php"
 			}
 		},
-		match: "(?i)^\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\\s*:(?!:)"
+		match: "(?i)^\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*(?<!default))\\s*:(?!:)"
 	},
 	{
 		include: "#string-backtick"
@@ -1186,6 +1224,120 @@ var repository = {
 			}
 		]
 	},
+	"inheritance-single": {
+		patterns: [
+			{
+				begin: "(?i)(?=\\\\?[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*\\\\)",
+				end: "(?i)([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)?(?=[^a-z0-9_\\x{7f}-\\x{10ffff}\\\\])",
+				endCaptures: {
+					"1": {
+						name: "entity.other.inherited-class.php"
+					}
+				},
+				patterns: [
+					{
+						include: "#namespace"
+					}
+				]
+			},
+			{
+				include: "#class-builtin"
+			},
+			{
+				include: "#namespace"
+			},
+			{
+				match: "(?i)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*",
+				name: "entity.other.inherited-class.php"
+			}
+		]
+	},
+	"class-extends": {
+		patterns: [
+			{
+				begin: "(?i)(extends)\\s+",
+				beginCaptures: {
+					"1": {
+						name: "storage.modifier.extends.php"
+					}
+				},
+				end: "(?i)(?=[^A-Za-z0-9_\\x{7f}-\\x{10ffff}\\\\])",
+				patterns: [
+					{
+						include: "#comments"
+					},
+					{
+						include: "#inheritance-single"
+					}
+				]
+			}
+		]
+	},
+	"interface-extends": {
+		patterns: [
+			{
+				begin: "(?i)(extends)\\s+",
+				beginCaptures: {
+					"1": {
+						name: "storage.modifier.extends.php"
+					}
+				},
+				end: "(?i)(?={)",
+				patterns: [
+					{
+						include: "#comments"
+					},
+					{
+						match: ",",
+						name: "punctuation.separator.classes.php"
+					},
+					{
+						include: "#inheritance-single"
+					}
+				]
+			}
+		]
+	},
+	"class-implements": {
+		patterns: [
+			{
+				begin: "(?i)(implements)\\s+",
+				beginCaptures: {
+					"1": {
+						name: "storage.modifier.implements.php"
+					}
+				},
+				end: "(?i)(?={)",
+				patterns: [
+					{
+						include: "#comments"
+					},
+					{
+						match: ",",
+						name: "punctuation.separator.classes.php"
+					},
+					{
+						include: "#inheritance-single"
+					}
+				]
+			}
+		]
+	},
+	"class-constant": {
+		patterns: [
+			{
+				match: "(?i)\\b(const)\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)",
+				captures: {
+					"1": {
+						name: "storage.modifier.php"
+					},
+					"2": {
+						name: "constant.other.php"
+					}
+				}
+			}
+		]
+	},
 	comments: {
 		patterns: [
 			{
@@ -1620,7 +1772,7 @@ var repository = {
 				]
 			},
 			{
-				begin: "(<<<)\\s*(\"?)(SQL)(\\2)(\\s*)$",
+				begin: "(<<<)\\s*(\"?)([DS]QL)(\\2)(\\s*)$",
 				beginCaptures: {
 					"0": {
 						name: "punctuation.section.embedded.begin.php"
@@ -1975,7 +2127,7 @@ var repository = {
 				]
 			},
 			{
-				begin: "(<<<)\\s*'(SQL)'(\\s*)$",
+				begin: "(<<<)\\s*'([DS]QL)'(\\s*)$",
 				beginCaptures: {
 					"0": {
 						name: "punctuation.section.embedded.begin.php"

package/dist/scalameta.js

@@ -4,7 +4,7 @@ var scalameta = [
     "properties": {
       "metals.serverVersion": {
         "type": "string",
-        "default": "0.11.2+125-ed5fb2f2-SNAPSHOT",
+        "default": "0.11.6+67-926ec9a3-SNAPSHOT",
         "markdownDescription": "The version of the Metals server artifact. Requires reloading the window.  \n\n**VS Code extension version is guaranteed to work only with the default version, change if you know what you're doing**",
         "scope": 3
       },
@@ -88,11 +88,27 @@ var scalameta = [
         "markdownDescription": "Optional custom path to the .scalafix.conf file.\n\nShould be an absolute path and use forward slashes `/` for file separators (even on Windows).",
         "scope": 3
       },
+      "metals.scalafixRulesDependencies": {
+        "type": "array",
+        "scope": 2,
+        "items": {
+          "type": "string"
+        },
+        "markdownDescription": "List of Scalafix rules dependencies in case they are not available by default in Metals and running scalafix fails due to 'rule not found' exception. For example: `com.github.liancheng::organize-imports:0.6.0` which follows the [coursier](https://get-coursier.io/) convention."
+      },
       "metals.bloopVersion": {
         "type": "string",
         "markdownDescription": "This version will be used for the Bloop build tool plugin, for any supported build tool,while importing in Metals as well as for running the embedded server",
         "scope": 3
       },
+      "metals.bloopJvmProperties": {
+        "type": "array",
+        "scope": 6,
+        "items": {
+          "type": "string"
+        },
+        "markdownDescription": "Optional list of JVM properties to pass along to the Bloop server. Each property needs to be a separate item.\n\nExample: `-Xmx1G` or `-Xms100M`"
+      },
       "metals.bloopSbtAlreadyInstalled": {
         "type": "boolean",
         "markdownDescription": "If true, Metals will not generate a `project/metals.sbt` file under the assumption that sbt-bloop is already manually installed in the sbt build. Build import will fail with a 'not valid command bloopInstall' error in case Bloop is not manually installed in the build when using this option.",
@@ -156,7 +172,8 @@ var scalameta = [
           "2.12.9",
           "2.12.8",
           "2.11.12",
-          "3.1.2-RC2",
+          "3.1.3-RC2",
+          "3.1.2",
           "3.1.1",
           "3.1.0",
           "3.0.2",