Update grammars (#200730)

2024-07-02 15:59:00 +00:00 · 2023-12-13 12:08:01 +00:00 · 2023-12-13 12:08:01 +00:00 · 3c86ede5f5
commit 3c86ede5f5
parent b7fcbef3e2
22 changed files with 543 additions and 916 deletions
--- a/extensions/csharp/cgmanifest.json
+++ b/extensions/csharp/cgmanifest.json
@ -6,7 +6,7 @@
 				"git": {
 					"name": "dotnet/csharp-tmLanguage",
 					"repositoryUrl": "https://github.com/dotnet/csharp-tmLanguage",
-					"commitHash": "6666eb1d5e6fb565a4110d6db645cc534fb3c6d2"
+					"commitHash": "7bf5709ac1a713e340a618d1b41f44a043e393c6"
 				}
 			},
 			"license": "MIT",
--- a/extensions/csharp/syntaxes/csharp.tmLanguage.json
+++ b/extensions/csharp/syntaxes/csharp.tmLanguage.json
@ -4,7 +4,7 @@
 		"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."
 	],
-	"version": "https://github.com/dotnet/csharp-tmLanguage/commit/6666eb1d5e6fb565a4110d6db645cc534fb3c6d2",
+	"version": "https://github.com/dotnet/csharp-tmLanguage/commit/7bf5709ac1a713e340a618d1b41f44a043e393c6",
 	"name": "C#",
 	"scopeName": "source.cs",
 	"patterns": [
@ -232,7 +232,7 @@
 					"include": "#try-statement"
 				},
 				{
-					"include": "#checked-unchecked-statement"
+					"include": "#expression-operator-expression"
 				},
 				{
 					"include": "#context-control-statement"
@ -3824,7 +3824,7 @@
 		},
 		"char-character-escape": {
 			"name": "constant.character.escape.cs",
-			"match": "\\\\(['\"\\\\0abfnrtv]|x[0-9a-fA-F]{1,4}|u[0-9a-fA-F]{4})"
+			"match": "\\\\(x[0-9a-fA-F]{1,4}|u[0-9a-fA-F]{4}|.)"
 		},
 		"string-literal": {
 			"name": "string.quoted.double.cs",
@ -3851,7 +3851,7 @@
 		},
 		"string-character-escape": {
 			"name": "constant.character.escape.cs",
-			"match": "\\\\(['\"\\\\0abfnrtv]|x[0-9a-fA-F]{1,4}|U[0-9a-fA-F]{8}|u[0-9a-fA-F]{4})"
+			"match": "\\\\(x[0-9a-fA-F]{1,4}|U[0-9a-fA-F]{8}|u[0-9a-fA-F]{4}|.)"
 		},
 		"verbatim-string-literal": {
 			"name": "string.quoted.double.cs",
--- a/extensions/dart/cgmanifest.json
+++ b/extensions/dart/cgmanifest.json
@ -6,7 +6,7 @@
 				"git": {
 					"name": "dart-lang/dart-syntax-highlight",
 					"repositoryUrl": "https://github.com/dart-lang/dart-syntax-highlight",
-					"commitHash": "bd0079ba7ca85cdd6400a8a467e532b539d0f285"
+					"commitHash": "0a6648177bdbb91a4e1a38c16e57ede0ccba4f18"
 				}
 			},
 			"licenseDetail": [
--- a/extensions/dart/syntaxes/dart.tmLanguage.json
+++ b/extensions/dart/syntaxes/dart.tmLanguage.json
@ -4,7 +4,7 @@
 		"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."
 	],
-	"version": "https://github.com/dart-lang/dart-syntax-highlight/commit/bd0079ba7ca85cdd6400a8a467e532b539d0f285",
+	"version": "https://github.com/dart-lang/dart-syntax-highlight/commit/0a6648177bdbb91a4e1a38c16e57ede0ccba4f18",
 	"name": "Dart",
 	"scopeName": "source.dart",
 	"patterns": [
@ -90,15 +90,7 @@
 					"end": "```"
 				},
 				{
-					"match": "(`.*?`)",
-					"captures": {
-						"0": {
-							"name": "variable.other.source.dart"
-						}
-					}
-				},
-				{
-					"match": "(`.*?`)",
+					"match": "(`[^`]+?`)",
 					"captures": {
 						"0": {
 							"name": "variable.other.source.dart"
@ -395,6 +387,7 @@
 		"string-interp": {
 			"patterns": [
 				{
+					"name": "string.interpolated.expression.dart",
 					"match": "\\$([a-zA-Z0-9_]+)",
 					"captures": {
 						"1": {
@ -408,8 +401,7 @@
 					"end": "\\}",
 					"patterns": [
 						{
-							"include": "#constants-and-special-vars",
-							"name": "variable.parameter.dart"
+							"include": "#constants-and-special-vars"
 						},
 						{
 							"include": "#strings"
--- a/extensions/fsharp/cgmanifest.json
+++ b/extensions/fsharp/cgmanifest.json
@ -6,7 +6,7 @@
 				"git": {
 					"name": "ionide/ionide-fsgrammar",
 					"repositoryUrl": "https://github.com/ionide/ionide-fsgrammar",
-					"commitHash": "078bbf85225b82de3ae4c2db7ee74d9239b249ce"
+					"commitHash": "472c6b2030c962217cbbb26e4ddcce1b8ffe0867"
 				}
 			},
 			"license": "MIT",
--- a/extensions/fsharp/syntaxes/fsharp.tmLanguage.json
+++ b/extensions/fsharp/syntaxes/fsharp.tmLanguage.json
@ -4,7 +4,7 @@
 		"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."
 	],
-	"version": "https://github.com/ionide/ionide-fsgrammar/commit/078bbf85225b82de3ae4c2db7ee74d9239b249ce",
+	"version": "https://github.com/ionide/ionide-fsgrammar/commit/472c6b2030c962217cbbb26e4ddcce1b8ffe0867",
 	"name": "fsharp",
 	"scopeName": "source.fsharp",
 	"patterns": [
@ -600,7 +600,7 @@
 				},
 				{
 					"name": "comment.line.double-slash.fsharp",
-					"match": "(?<![!%&+-.<=>?@^|/])//(?![!%&+-.<=>?@^|]).*$"
+					"match": "(?<![!%&+-.<=>?@^|/])//(.*$)"
 				}
 			]
 		},
@ -630,7 +630,7 @@
 		},
 		"abstract_definition": {
 			"name": "abstract.definition.fsharp",
-			"begin": "\\b(abstract)\\s+(member)?(\\s+\\[\\<.*\\>\\])?\\s*([_[:alpha:]0-9,\\._`\\s]+)(:)",
+			"begin": "\\b(abstract)\\s+(member)?(\\s+\\[\\<.*\\>\\])?\\s*([_[:alpha:]0-9,\\._`\\s]+)(<)?",
 			"end": "\\s*(with)\\b|=|$",
 			"beginCaptures": {
 				"1": {
@ -676,7 +676,7 @@
 					}
 				},
 				{
-					"match": "(?!with|get|set\\b)\\b([\\w0-9'`^._]+)",
+					"match": "(?!with|get|set\\b)\\s*([\\w0-9'`^._]+)",
 					"comments": "Here we need the \\w modifier in order to check that the words isn't blacklisted",
 					"captures": {
 						"1": {
--- a/extensions/java/cgmanifest.json
+++ b/extensions/java/cgmanifest.json
@ -6,7 +6,7 @@
 				"git": {
 					"name": "redhat-developer/vscode-java",
 					"repositoryUrl": "https://github.com/redhat-developer/vscode-java",
-					"commitHash": "5d224a552cf5f0f8ebccf69e43e2575ed2c13839"
+					"commitHash": "f09b712f5d6d6339e765f58c8dfab3f78a378183"
 				}
 			},
 			"license": "MIT",
@ -44,7 +44,7 @@
 				"suitability for any purpose."
 			],
 			"description": "This grammar was derived from https://github.com/atom/language-java/blob/master/grammars/java.cson.",
-			"version": "1.22.0"
+			"version": "1.26.0"
 		}
 	],
 	"version": 1
--- a/extensions/java/syntaxes/java.tmLanguage.json
+++ b/extensions/java/syntaxes/java.tmLanguage.json
@ -4,7 +4,7 @@
 		"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."
 	],
-	"version": "https://github.com/redhat-developer/vscode-java/commit/5d224a552cf5f0f8ebccf69e43e2575ed2c13839",
+	"version": "https://github.com/redhat-developer/vscode-java/commit/f09b712f5d6d6339e765f58c8dfab3f78a378183",
 	"name": "Java",
 	"scopeName": "source.java",
 	"patterns": [
@ -1598,11 +1598,7 @@
 					"name": "string.quoted.triple.java",
 					"patterns": [
 						{
-							"match": "\\\\\"\"\"",
-							"name": "constant.character.escape.java"
-						},
-						{
-							"match": "\\\\.",
+							"match": "(\\\\\"\"\")(?!\")|(\\\\.)",
 							"name": "constant.character.escape.java"
 						}
 					]
--- a/extensions/julia/cgmanifest.json
+++ b/extensions/julia/cgmanifest.json
@ -6,7 +6,7 @@
 				"git": {
 					"name": "JuliaEditorSupport/atom-language-julia",
 					"repositoryUrl": "https://github.com/JuliaEditorSupport/atom-language-julia",
-					"commitHash": "85cf3ef2ddcb7bc9b2b17b2a5f1fc664e1f1e718"
+					"commitHash": "8747e069119b24bff2703374d7961e3446a74034"
 				}
 			},
 			"license": "MIT",
--- a/extensions/julia/syntaxes/julia.tmLanguage.json
+++ b/extensions/julia/syntaxes/julia.tmLanguage.json
@ -4,7 +4,7 @@
 		"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."
 	],
-	"version": "https://github.com/JuliaEditorSupport/atom-language-julia/commit/85cf3ef2ddcb7bc9b2b17b2a5f1fc664e1f1e718",
+	"version": "https://github.com/JuliaEditorSupport/atom-language-julia/commit/8747e069119b24bff2703374d7961e3446a74034",
 	"name": "Julia",
 	"scopeName": "source.julia",
 	"comment": "This grammar is used by Atom (Oniguruma), GitHub (PCRE), and VSCode (Oniguruma),\nso all regexps must be compatible with both engines.\n\nSpecs:\n- https://github.com/kkos/oniguruma/blob/master/doc/RE\n- https://www.pcre.org/current/doc/html/",
@ -30,6 +30,9 @@
 		{
 			"include": "#function_call"
 		},
+		{
+			"include": "#for_block"
+		},
 		{
 			"include": "#keyword"
 		},
@ -76,11 +79,7 @@
 							"name": "constant.numeric.julia"
 						},
 						{
-							"match": "\\bfor\\b",
-							"name": "keyword.control.julia"
-						},
-						{
-							"include": "$self"
+							"include": "#self_no_for_block"
 						}
 					]
 				}
@ -106,7 +105,7 @@
 					},
 					"patterns": [
 						{
-							"include": "$self"
+							"include": "#self_no_for_block"
 						}
 					]
 				}
@ -115,8 +114,26 @@
 		"bracket": {
 			"patterns": [
 				{
-					"match": "(?:\\(|\\)|\\[|\\]|\\{|\\}|,|;)(?!('|(?:\\.'))*\\.?')",
-					"name": "meta.bracket.julia"
+					"begin": "\\{",
+					"beginCaptures": {
+						"0": {
+							"name": "meta.bracket.julia"
+						}
+					},
+					"end": "(\\})((?:\\.)?'*)",
+					"endCaptures": {
+						"1": {
+							"name": "meta.bracket.julia"
+						},
+						"2": {
+							"name": "keyword.operator.transpose.julia"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#self_no_for_block"
+						}
+					]
 				}
 			]
 		},
@ -215,11 +232,7 @@
 					},
 					"patterns": [
 						{
-							"match": "\\bfor\\b",
-							"name": "keyword.control.julia"
-						},
-						{
-							"include": "$self"
+							"include": "#self_no_for_block"
 						}
 					]
 				}
@ -259,14 +272,10 @@
 				}
 			]
 		},
-		"keyword": {
+		"for_block": {
+			"comment": "for blocks need to be special-cased to support tokenizing 'outer' properly",
 			"patterns": [
 				{
-					"match": "\\b(?<![:_\\.])(?:function|mutable\\s+struct|struct|macro|quote|abstract\\s+type|primitive\\s+type|module|baremodule|where)\\b",
-					"name": "keyword.other.julia"
-				},
-				{
-					"comment": "special case for blocks to support tokenizing outer properly",
 					"begin": "\\b(for)\\b",
 					"beginCaptures": {
 						"0": {
@ -283,9 +292,17 @@
 							"include": "$self"
 						}
 					]
+				}
+			]
+		},
+		"keyword": {
+			"patterns": [
+				{
+					"match": "\\b(?<![:_\\.])(?:function|mutable\\s+struct|struct|macro|quote|abstract\\s+type|primitive\\s+type|module|baremodule|where)\\b",
+					"name": "keyword.other.julia"
 				},
 				{
-					"match": "\\b(?<![:_])(?:if|else|elseif|while|begin|let|do|try|catch|finally|return|break|continue)\\b",
+					"match": "\\b(?<![:_])(?:if|else|elseif|for|while|begin|let|do|try|catch|finally|return|break|continue)\\b",
 					"name": "keyword.control.julia"
 				},
 				{
@ -608,7 +625,12 @@
 						"0": {
 							"name": "punctuation.definition.string.end.julia"
 						}
-					}
+					},
+					"patterns": [
+						{
+							"include": "#string_escaped_char"
+						}
+					]
 				},
 				{
 					"begin": "(raw)(\")",
@ -626,7 +648,12 @@
 						"0": {
 							"name": "punctuation.definition.string.end.julia"
 						}
-					}
+					},
+					"patterns": [
+						{
+							"include": "#string_escaped_char"
+						}
+					]
 				},
 				{
 					"begin": "(sql)(\"\"\")",
@ -658,12 +685,22 @@
 				{
 					"begin": "var\"\"\"",
 					"end": "\"\"\"",
-					"name": "constant.other.symbol.julia"
+					"name": "constant.other.symbol.julia",
+					"patterns": [
+						{
+							"include": "#string_escaped_char"
+						}
+					]
 				},
 				{
 					"begin": "var\"",
 					"end": "\"",
-					"name": "constant.other.symbol.julia"
+					"name": "constant.other.symbol.julia",
+					"patterns": [
+						{
+							"include": "#string_escaped_char"
+						}
+					]
 				},
 				{
 					"begin": "^\\s?(doc)?(\"\"\")\\s?$",
@ -931,24 +968,27 @@
 		"string_dollar_sign_interpolate": {
 			"patterns": [
 				{
-					"match": "\\$(?:[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{So}←-⇿])(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿])*",
+					"match": "\\$(?:[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{So}←-⇿]|[^\\p{^Sc}$])(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿]|[^\\p{^Sc}$])*",
 					"name": "variable.interpolation.julia"
 				},
 				{
-					"begin": "\\$\\(",
+					"begin": "\\$(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "meta.bracket.julia"
+						}
+					},
 					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "meta.bracket.julia"
+						}
+					},
 					"name": "variable.interpolation.julia",
 					"comment": "`punctuation.section.embedded`, `constant.escape`,\n& `meta.embedded.line` were considered but appear to have even spottier\nsupport among popular syntaxes.",
 					"patterns": [
 						{
-							"match": "\\bfor\\b",
-							"name": "keyword.control.julia"
-						},
-						{
-							"include": "#parentheses"
-						},
-						{
-							"include": "$self"
+							"include": "#self_no_for_block"
 						}
 					]
 				}
@ -981,6 +1021,47 @@
 					"name": "meta.type.julia"
 				}
 			]
+		},
+		"self_no_for_block": {
+			"comment": "Same as $self, but does not contain #for_block. 'outer' is not valid in some contexts (e.g. generators, comprehensions, indexing), so use this when matching those in begin/end patterns. Keep this up-to-date with $self!",
+			"patterns": [
+				{
+					"include": "#operator"
+				},
+				{
+					"include": "#array"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#parentheses"
+				},
+				{
+					"include": "#bracket"
+				},
+				{
+					"include": "#function_decl"
+				},
+				{
+					"include": "#function_call"
+				},
+				{
+					"include": "#keyword"
+				},
+				{
+					"include": "#number"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#type_decl"
+				},
+				{
+					"include": "#symbol"
+				}
+			]
 		}
 	}
 }
--- a/extensions/latex/cgmanifest.json
+++ b/extensions/latex/cgmanifest.json
@ -6,7 +6,7 @@
 				"git": {
 					"name": "jlelong/vscode-latex-basics",
 					"repositoryUrl": "https://github.com/jlelong/vscode-latex-basics",
-					"commitHash": "221a2443a5e8ac029685a0f872af39b23cc2b634"
+					"commitHash": "e0f2c26cdc94a9439acc565215c7bdbf379afb1f"
 				}
 			},
 			"license": "MIT",
--- a/extensions/latex/syntaxes/LaTeX.tmLanguage.json
+++ b/extensions/latex/syntaxes/LaTeX.tmLanguage.json
@ -4,7 +4,7 @@
 		"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."
 	],
-	"version": "https://github.com/jlelong/vscode-latex-basics/commit/221a2443a5e8ac029685a0f872af39b23cc2b634",
+	"version": "https://github.com/jlelong/vscode-latex-basics/commit/e0f2c26cdc94a9439acc565215c7bdbf379afb1f",
 	"name": "LaTeX",
 	"scopeName": "text.tex.latex",
 	"patterns": [
@ -1197,6 +1197,74 @@
 			"name": "meta.function.verbatim.latex"
 		},
 		{
+			"comment": "Captures \\command[option]{url}{optional category}{optional name}{text}",
+			"begin": "(?:\\s*)((\\\\)(?:href|hyperref|hyperimage))(?=\\[|\\{)",
+			"beginCaptures": {
+				"1": {
+					"name": "support.function.url.latex"
+				}
+			},
+			"end": "(\\})",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.definition.arguments.end.latex"
+				}
+			},
+			"name": "meta.function.hyperlink.latex",
+			"patterns": [
+				{
+					"include": "#multiline-optional-arg-no-highlight"
+				},
+				{
+					"begin": "(?:\\G|(?<=\\]))(\\{)([^}]*)(\\})(?:\\{[^}]*\\}){2}?(\\{)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.begin.latex"
+						},
+						"2": {
+							"name": "markup.underline.link.latex"
+						},
+						"3": {
+							"name": "punctuation.definition.arguments.end.latex"
+						},
+						"4": {
+							"name": "punctuation.definition.arguments.begin.latex"
+						}
+					},
+					"end": "(?=\\})",
+					"patterns": [
+						{
+							"include": "$base"
+						}
+					],
+					"contentName": "meta.variable.parameter.function.latex"
+				},
+				{
+					"begin": "(?:\\G|(?<=\\]))(?:(\\{)[^}]*(\\}))?(\\{)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.begin.latex"
+						},
+						"2": {
+							"name": "punctuation.definition.arguments.end.latex"
+						},
+						"3": {
+							"name": "punctuation.definition.arguments.begin.latex"
+						}
+					},
+					"end": "(?=\\})",
+					"patterns": [
+						{
+							"include": "$base"
+						}
+					],
+					"contentName": "meta.variable.parameter.function.latex"
+				}
+			]
+		},
+		{
+			"match": "(?:\\s*)((\\\\)url)(\\{)([^}]*)(\\})",
+			"name": "meta.function.link.url.latex",
 			"captures": {
 				"1": {
 					"name": "support.function.url.latex"
@ -1205,33 +1273,15 @@
 					"name": "punctuation.definition.function.latex"
 				},
 				"3": {
-					"patterns": [
-						{
-							"include": "#optional-arg"
-						}
-					]
-				},
-				"4": {
 					"name": "punctuation.definition.arguments.begin.latex"
 				},
 				"5": {
+					"name": "punctuation.definition.arguments.end.latex"
+				},
+				"'": {
 					"name": "markup.underline.link.latex"
-				},
-				"6": {
-					"name": "punctuation.definition.arguments.end.latex"
-				},
-				"7": {
-					"name": "punctuation.definition.arguments.begin.latex"
-				},
-				"8": {
-					"name": "entity.name.hyperlink.latex"
-				},
-				"9": {
-					"name": "punctuation.definition.arguments.end.latex"
 				}
-			},
-			"match": "(?:\\s*)((\\\\)(?:url|href|hyperref|hyperimage))(\\[[^\\[]*?\\])?(\\{)([^}]*)(\\})(?:\\{[^}]*\\}){2}?(?:(\\{)([^}]*)(\\}))?",
-			"name": "meta.function.link.url.latex"
+			}
 		},
 		{
 			"comment": "These two patterns match the \\begin{document} and \\end{document} commands, so that the environment matching pattern following them will ignore those commands.",
@ -2070,36 +2120,6 @@
 				}
 			]
 		},
-		{
-			"begin": "(,,)",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.definition.string.begin.latex"
-				}
-			},
-			"end": "(?<!\\\\)(\\`\\`)",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.string.end.latex"
-				}
-			},
-			"name": "string.quoted.double.latex"
-		},
-		{
-			"begin": "(?<!\\\\|\\\\catcode|\\\\string)(\\`\\`)",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.definition.string.begin.latex"
-				}
-			},
-			"end": "(?<!\\\\)(\\'\\'|\")",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.string.end.latex"
-				}
-			},
-			"name": "string.quoted.double.latex"
-		},
 		{
 			"begin": "\\$\\$",
 			"beginCaptures": {
--- a/extensions/latex/syntaxes/TeX.tmLanguage.json
+++ b/extensions/latex/syntaxes/TeX.tmLanguage.json
@ -4,7 +4,7 @@
 		"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."
 	],
-	"version": "https://github.com/jlelong/vscode-latex-basics/commit/3ae82b457c28f0368cbbb47024b0245ef1ff3d33",
+	"version": "https://github.com/jlelong/vscode-latex-basics/commit/69915f318570484ef40ed8798c73c63c58704183",
 	"name": "TeX",
 	"scopeName": "text.tex",
 	"patterns": [
@ -166,7 +166,7 @@
 							"name": "punctuation.definition.constant.math.tex"
 						}
 					},
-					"match": "(\\\\)(s(s(earrow|warrow|lash)|h(ort(downarrow|uparrow|parallel|leftarrow|rightarrow|mid)|arp)|tar|i(gma|m(eq)?)|u(cc(sim|n(sim|approx)|curlyeq|eq|approx)?|pset(neq(q)?|plus(eq)?|eq(q)?)?|rd|m|bset(neq(q)?|plus(eq)?|eq(q)?)?)|p(hericalangle|adesuit)|e(tminus|arrow)|q(su(pset(eq)?|bset(eq)?)|c(up|ap)|uare)|warrow|m(ile|all(s(etminus|mile)|frown)))|h(slash|ook(leftarrow|rightarrow)|eartsuit|bar)|R(sh|ightarrow|e|bag)|Gam(e|ma)|n(s(hort(parallel|mid)|im|u(cc(eq)?|pseteq(q)?|bseteq))|Rightarrow|n(earrow|warrow)|cong|triangle(left(eq(slant)?)?|right(eq(slant)?)?)|i(plus)?|u|p(lus|arallel|rec(eq)?)|e(q|arrow|g|xists)|v(dash|Dash)|warrow|le(ss|q(slant|q)?|ft(arrow|rightarrow))|a(tural|bla)|VDash|rightarrow|g(tr|eq(slant|q)?)|mid|Left(arrow|rightarrow))|c(hi|irc(eq|le(d(circ|S|dash|ast)|arrow(left|right)))?|o(ng|prod|lon|mplement)|dot(s|p)?|u(p|r(vearrow(left|right)|ly(eq(succ|prec)|vee(downarrow|uparrow)?|wedge(downarrow|uparrow)?)))|enterdot|lubsuit|ap)|Xi|Maps(to(char)?|from(char)?)|B(ox|umpeq|bbk)|t(h(ick(sim|approx)|e(ta|refore))|imes|op|wohead(leftarrow|rightarrow)|a(u|lloblong)|riangle(down|q|left(eq(slant)?)?|right(eq(slant)?)?)?)|i(n(t(er(cal|leave))?|plus|fty)?|ota|math)|S(igma|u(pset|bset))|zeta|o(slash|times|int|dot|plus|vee|wedge|lessthan|greaterthan|m(inus|ega)|b(slash|long|ar))|d(i(v(ideontimes)?|a(g(down|up)|mond(suit)?)|gamma)|o(t(plus|eq(dot)?)|ublebarwedge|wn(harpoon(left|right)|downarrows|arrow))|d(ots|agger)|elta|a(sh(v|leftarrow|rightarrow)|leth|gger))|Y(down|up|left|right)|C(up|ap)|u(n(lhd|rhd)|p(silon|harpoon(left|right)|downarrow|uparrows|lus|arrow)|lcorner|rcorner)|jmath|Theta|Im|p(si|hi|i(tchfork)?|erp|ar(tial|allel)|r(ime|o(d|pto)|ec(sim|n(sim|approx)|curlyeq|eq|approx)?)|m)|e(t(h|a)|psilon|q(slant(less|gtr)|circ|uiv)|ll|xists|mptyset)|Omega|D(iamond|ownarrow|elta)|v(d(ots|ash)|ee(bar)?|Dash|ar(s(igma|u(psetneq(q)?|bsetneq(q)?))|nothing|curly(vee|wedge)|t(heta|imes|riangle(left|right)?)|o(slash|circle|times|dot|plus|vee|wedge|lessthan|ast|greaterthan|minus|b(slash|ar))|p(hi|i|ropto)|epsilon|kappa|rho|bigcirc))|kappa|Up(silon|downarrow|arrow)|Join|f(orall|lat|a(t(s(emi|lash)|bslash)|llingdotseq)|rown)|P(si|hi|i)|w(p|edge|r)|l(hd|n(sim|eq(q)?|approx)|ceil|times|ightning|o(ng(left(arrow|rightarrow)|rightarrow|maps(to|from))|zenge|oparrow(left|right))|dot(s|p)|e(ss(sim|dot|eq(qgtr|gtr)|approx|gtr)|q(slant|q)?|ft(slice|harpoon(down|up)|threetimes|leftarrows|arrow(t(ail|riangle))?|right(squigarrow|harpoons|arrow(s|triangle|eq)?))|adsto)|vertneqq|floor|l(c(orner|eil)|floor|l|bracket)?|a(ngle|mbda)|rcorner|bag)|a(s(ymp|t)|ngle|pprox(eq)?|l(pha|eph)|rrownot|malg)|V(dash|vdash)|r(h(o|d)|ceil|times|i(singdotseq|ght(s(quigarrow|lice)|harpoon(down|up)|threetimes|left(harpoons|arrows)|arrow(t(ail|riangle))?|rightarrows))|floor|angle|r(ceil|parenthesis|floor|bracket)|bag)|g(n(sim|eq(q)?|approx)|tr(sim|dot|eq(qless|less)|less|approx)|imel|eq(slant|q)?|vertneqq|amma|g(g)?)|Finv|xi|m(ho|i(nuso|d)|o(o|dels)|u(ltimap)?|p|e(asuredangle|rge)|aps(to|from(char)?))|b(i(n(dnasrepma|ampersand)|g(s(tar|qc(up|ap))|nplus|c(irc|u(p|rly(vee|wedge))|ap)|triangle(down|up)|interleave|o(times|dot|plus)|uplus|parallel|vee|wedge|box))|o(t|wtie|x(slash|circle|times|dot|plus|empty|ast|minus|b(slash|ox|ar)))|u(llet|mpeq)|e(cause|t(h|ween|a))|lack(square|triangle(down|left|right)?|lozenge)|a(ck(s(im(eq)?|lash)|prime|epsilon)|r(o|wedge))|bslash)|L(sh|ong(left(arrow|rightarrow)|rightarrow|maps(to|from))|eft(arrow|rightarrow)|leftarrow|ambda|bag)|Arrownot)(?![a-zA-Z])",
+					"match": "(\\\\)(s(s(earrow|warrow|lash)|h(ort(downarrow|uparrow|parallel|leftarrow|rightarrow|mid)|arp)|tar|i(gma|m(eq)?)|u(cc(sim|n(sim|approx)|curlyeq|eq|approx)?|pset(neq(q)?|plus(eq)?|eq(q)?)?|rd|m|bset(neq(q)?|plus(eq)?|eq(q)?)?)|p(hericalangle|adesuit)|e(tminus|arrow)|q(su(pset(eq)?|bset(eq)?)|c(up|ap)|uare)|warrow|m(ile|all(s(etminus|mile)|frown)))|h(slash|ook(leftarrow|rightarrow)|eartsuit|bar)|R(sh|ightarrow|e|bag)|Gam(e|ma)|n(s(hort(parallel|mid)|im|u(cc(eq)?|pseteq(q)?|bseteq))|Rightarrow|n(earrow|warrow)|cong|triangle(left(eq(slant)?)?|right(eq(slant)?)?)|i(plus)?|u|p(lus|arallel|rec(eq)?)|e(q|arrow|g|xists)|v(dash|Dash)|warrow|le(ss|q(slant|q)?|ft(arrow|rightarrow))|a(tural|bla)|VDash|rightarrow|g(tr|eq(slant|q)?)|mid|Left(arrow|rightarrow))|c(hi|irc(eq|le(d(circ|S|dash|ast)|arrow(left|right)))?|o(ng|prod|lon|mplement)|dot(s|p)?|u(p|r(vearrow(left|right)|ly(eq(succ|prec)|vee(downarrow|uparrow)?|wedge(downarrow|uparrow)?)))|enterdot|lubsuit|ap)|Xi|Maps(to(char)?|from(char)?)|B(ox|umpeq|bbk)|t(h(ick(sim|approx)|e(ta|refore))|imes|op|wohead(leftarrow|rightarrow)|a(u|lloblong)|riangle(down|q|left(eq(slant)?)?|right(eq(slant)?)?)?)|i(n(t(er(cal|leave))?|plus|fty)?|ota|math)|S(igma|u(pset|bset))|zeta|o(slash|times|int|dot|plus|vee|wedge|lessthan|greaterthan|m(inus|ega)|b(slash|long|ar))|d(i(v(ideontimes)?|a(g(down|up)|mond(suit)?)|gamma)|o(t(plus|eq(dot)?)|ublebarwedge|wn(harpoon(left|right)|downarrows|arrow))|d(ots|agger)|elta|a(sh(v|leftarrow|rightarrow)|leth|gger))|Y(down|up|left|right)|C(up|ap)|u(n(lhd|rhd)|p(silon|harpoon(left|right)|downarrow|uparrows|lus|arrow)|lcorner|rcorner)|jmath|Theta|Im|p(si|hi|i(tchfork)?|erp|ar(tial|allel)|r(ime|o(d|pto)|ec(sim|n(sim|approx)|curlyeq|eq|approx)?)|m)|e(t(h|a)|psilon|q(slant(less|gtr)|circ|uiv)|ll|xists|mptyset)|Omega|D(iamond|ownarrow|elta)|v(d(ots|ash)|ee(bar)?|Dash|ar(s(igma|u(psetneq(q)?|bsetneq(q)?))|nothing|curly(vee|wedge)|t(heta|imes|riangle(left|right)?)|o(slash|circle|times|dot|plus|vee|wedge|lessthan|ast|greaterthan|minus|b(slash|ar))|p(hi|i|ropto)|epsilon|kappa|rho|bigcirc))|kappa|Up(silon|downarrow|arrow)|Join|f(orall|lat|a(t(s(emi|lash)|bslash)|llingdotseq)|rown)|P(si|hi|i)|w(p|edge|r)|l(hd|n(sim|eq(q)?|approx)|ceil|times|ightning|o(ng(left(arrow|rightarrow)|rightarrow|maps(to|from))|zenge|oparrow(left|right))|dot(s|p)|e(ss(sim|dot|eq(qgtr|gtr)|approx|gtr)|q(slant|q)?|ft(slice|harpoon(down|up)|threetimes|leftarrows|arrow(t(ail|riangle))?|right(squigarrow|harpoons|arrow(s|triangle|eq)?))|adsto)|vertneqq|floor|l(c(orner|eil)|floor|l|bracket)?|a(ngle|mbda)|rcorner|bag)|a(s(ymp|t)|ngle|pprox(eq)?|l(pha|eph)|rrownot|malg)|V(dash|vdash)|r(h(o|d)|ceil|times|i(singdotseq|ght(s(quigarrow|lice)|harpoon(down|up)|threetimes|left(harpoons|arrows)|arrow(t(ail|riangle))?|rightarrows))|floor|angle|r(ceil|parenthesis|floor|bracket)|bag)|g(n(sim|eq(q)?|approx)|tr(sim|dot|eq(qless|less)|less|approx)|imel|eq(slant|q)?|vertneqq|amma|g(g)?)|Finv|xi|m(ho|i(nuso|d)|o(o|dels)|u(ltimap)?|p|e(asuredangle|rge)|aps(to|from(char)?))|b(i(n(dnasrepma|ampersand)|g(s(tar|qc(up|ap))|nplus|c(irc|u(p|rly(vee|wedge))|ap)|triangle(down|up)|interleave|o(times|dot|plus)|uplus|parallel|vee|wedge|box))|o(t|wtie|x(slash|circle|times|dot|plus|empty|ast|minus|b(slash|ox|ar)))|u(llet|mpeq)|e(cause|t(h|ween|a))|lack(square|triangle(down|left|right)?|lozenge)|a(ck(s(im(eq)?|lash)|prime|epsilon)|r(o|wedge))|bslash)|L(sh|ong(left(arrow|rightarrow)|rightarrow|maps(to|from))|eft(arrow|rightarrow)|leftarrow|ambda|bag)|Arrownot)(?![a-zA-Z@])",
 					"name": "constant.character.math.tex"
 				},
 				{
--- a/extensions/lua/cgmanifest.json
+++ b/extensions/lua/cgmanifest.json
@ -6,7 +6,7 @@
 				"git": {
 					"name": "sumneko/lua.tmbundle",
 					"repositoryUrl": "https://github.com/sumneko/lua.tmbundle",
-					"commitHash": "3a18700941737c3ab66ac5964696f141aee61800"
+					"commitHash": "94ce82cc4d45f82641a5252d7a7fd9e28c875adc"
 				}
 			},
 			"licenseDetail": [
--- a/extensions/lua/syntaxes/lua.tmLanguage.json
+++ b/extensions/lua/syntaxes/lua.tmLanguage.json
@ -4,7 +4,7 @@
 		"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."
 	],
-	"version": "https://github.com/sumneko/lua.tmbundle/commit/3a18700941737c3ab66ac5964696f141aee61800",
+	"version": "https://github.com/sumneko/lua.tmbundle/commit/94ce82cc4d45f82641a5252d7a7fd9e28c875adc",
 	"name": "Lua",
 	"scopeName": "source.lua",
 	"patterns": [
@ -356,6 +356,26 @@
 						}
 					},
 					"patterns": [
+						{
+							"begin": "--\\[(=*)\\[@@@",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.comment.begin.lua"
+								}
+							},
+							"end": "\\]\\1\\]",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.comment.end.lua"
+								}
+							},
+							"name": "",
+							"patterns": [
+								{
+									"include": "source.lua"
+								}
+							]
+						},
 						{
 							"begin": "--\\[(=*)\\[",
 							"beginCaptures": {
@ -928,7 +948,6 @@
 		},
 		"ldoc_tag": {
 			"match": "\\G[ \\t]*(@)(alias|annotation|author|charset|class|classmod|comment|constructor|copyright|description|example|export|factory|field|file|fixme|function|include|lfunction|license|local|module|name|param|pragma|private|raise|release|return|script|section|see|set|static|submodule|summary|tfield|thread|tparam|treturn|todo|topic|type|usage|warning|within)\\b",
-			"end": "(?!@)\\b",
 			"captures": {
 				"1": {
 					"name": "punctuation.definition.block.tag.ldoc"
--- a/extensions/markdown-basics/cgmanifest.json
+++ b/extensions/markdown-basics/cgmanifest.json
@ -33,7 +33,7 @@
 				"git": {
 					"name": "microsoft/vscode-markdown-tm-grammar",
 					"repositoryUrl": "https://github.com/microsoft/vscode-markdown-tm-grammar",
-					"commitHash": "0a4b23580308fdcfb4ab7b526e3e13ba17d436fb"
+					"commitHash": "0b36cbbf917fb0188e1a1bafc8287c7abf8b0b37"
 				}
 			},
 			"license": "MIT",
--- a/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
+++ b/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
@ -4,7 +4,7 @@
 		"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."
 	],
-	"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/0a4b23580308fdcfb4ab7b526e3e13ba17d436fb",
+	"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/0b36cbbf917fb0188e1a1bafc8287c7abf8b0b37",
 	"name": "Markdown",
 	"scopeName": "text.html.markdown",
 	"patterns": [
@ -2255,12 +2255,7 @@
 					]
 				}
 			},
-			"name": "markup.heading.markdown",
-			"patterns": [
-				{
-					"include": "#inline"
-				}
-			]
+			"name": "markup.heading.markdown"
 		},
 		"heading-setext": {
 			"patterns": [
--- a/extensions/python/cgmanifest.json
+++ b/extensions/python/cgmanifest.json
@ -6,7 +6,7 @@
 				"git": {
 					"name": "MagicStack/MagicPython",
 					"repositoryUrl": "https://github.com/MagicStack/MagicPython",
-					"commitHash": "7d0f2b22a5ad8fccbd7341bc7b7a715169283044"
+					"commitHash": "c9b3409deb69acec31bbf7913830e93a046b30cc"
 				}
 			},
 			"license": "MIT",
--- a/extensions/sql/cgmanifest.json
+++ b/extensions/sql/cgmanifest.json
@ -6,11 +6,11 @@
 				"git": {
 					"name": "microsoft/vscode-mssql",
 					"repositoryUrl": "https://github.com/microsoft/vscode-mssql",
-					"commitHash": "9cb3529a978ddf599bf5bdd228f21bbcfe2914f5"
+					"commitHash": "49eff02f68b6ee73025c6665c672ca1c93385dde"
 				}
 			},
 			"license": "MIT",
-			"version": "1.20.0"
+			"version": "1.23.0"
 		}
 	],
 	"version": 1
--- a/extensions/sql/syntaxes/sql.tmLanguage.json
+++ b/extensions/sql/syntaxes/sql.tmLanguage.json
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-166781_rs.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-166781_rs.json
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_jl.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_jl.json
@ -182,35 +182,7 @@
 		}
 	},
 	{
-		"c": "queena",
-		"t": "source.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": ",",
-		"t": "source.julia meta.bracket.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": " queenb",
+		"c": "queena, queenb",
 		"t": "source.julia",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@ -392,35 +364,7 @@
 		}
 	},
 	{
-		"c": "queena",
-		"t": "source.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": ",",
-		"t": "source.julia meta.bracket.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": " queenb",
+		"c": "queena, queenb",
 		"t": "source.julia",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@ -602,35 +546,7 @@
 		}
 	},
 	{
-		"c": "queena",
-		"t": "source.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": ",",
-		"t": "source.julia meta.bracket.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": " queenb",
+		"c": "queena, queenb",
 		"t": "source.julia",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@ -1050,35 +966,7 @@
 		}
 	},
 	{
-		"c": "qa",
-		"t": "source.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": ",",
-		"t": "source.julia meta.bracket.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": " qb",
+		"c": "qa, qb",
 		"t": "source.julia",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@ -1176,35 +1064,7 @@
 		}
 	},
 	{
-		"c": "qa",
-		"t": "source.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": ",",
-		"t": "source.julia meta.bracket.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": " qb",
+		"c": "qa, qb",
 		"t": "source.julia",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@ -1302,35 +1162,7 @@
 		}
 	},
 	{
-		"c": "qa",
-		"t": "source.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": ",",
-		"t": "source.julia meta.bracket.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": " qb",
+		"c": "qa, qb",
 		"t": "source.julia",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@ -1428,35 +1260,7 @@
 		}
 	},
 	{
-		"c": "qa",
-		"t": "source.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": ",",
-		"t": "source.julia meta.bracket.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": " qb",
+		"c": "qa, qb",
 		"t": "source.julia",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@ -1512,35 +1316,7 @@
 		}
 	},
 	{
-		"c": "testqueen",
-		"t": "source.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": ",",
-		"t": "source.julia meta.bracket.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": " queens",
+		"c": "testqueen, queens",
 		"t": "source.julia",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@ -1708,7 +1484,7 @@
 		}
 	},
 	{
-		"c": "testqueen",
+		"c": "testqueen, q",
 		"t": "source.julia",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@ -1722,7 +1498,7 @@
 		}
 	},
 	{
-		"c": ",",
+		"c": ")",
 		"t": "source.julia meta.bracket.julia",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@ -1736,35 +1512,7 @@
 		}
 	},
 	{
-		"c": " q",
-		"t": "source.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": "),",
-		"t": "source.julia meta.bracket.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": " queens",
+		"c": ", queens",
 		"t": "source.julia",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@ -1848,91 +1596,7 @@
 		}
 	},
 	{
-		"c": "nsquaresx",
-		"t": "source.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": ",",
-		"t": "source.julia meta.bracket.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": " nsquaresy",
-		"t": "source.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": ",",
-		"t": "source.julia meta.bracket.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": " nqueens",
-		"t": "source.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": ",",
-		"t": "source.julia meta.bracket.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": " presqueens ",
+		"c": "nsquaresx, nsquaresy, nqueens, presqueens ",
 		"t": "source.julia",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@ -2408,35 +2072,7 @@
 		}
 	},
 	{
-		"c": "xsquare",
-		"t": "source.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": ",",
-		"t": "source.julia meta.bracket.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": " ysquare",
+		"c": "xsquare, ysquare",
 		"t": "source.julia",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@ -2548,35 +2184,7 @@
 		}
 	},
 	{
-		"c": "testqueen",
-		"t": "source.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": ",",
-		"t": "source.julia meta.bracket.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": " presqueens",
+		"c": "testqueen, presqueens",
 		"t": "source.julia",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@ -2688,21 +2296,7 @@
 		}
 	},
 	{
-		"c": ",",
-		"t": "source.julia meta.bracket.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": " testqueen",
+		"c": ", testqueen",
 		"t": "source.julia",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@ -2800,63 +2394,7 @@
 		}
 	},
 	{
-		"c": "nsquaresx",
-		"t": "source.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": ",",
-		"t": "source.julia meta.bracket.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": " nsquaresy",
-		"t": "source.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": ",",
-		"t": "source.julia meta.bracket.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": " nqueens ",
+		"c": "nsquaresx, nsquaresy, nqueens ",
 		"t": "source.julia",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@ -2912,21 +2450,7 @@
 		}
 	},
 	{
-		"c": ",",
-		"t": "source.julia meta.bracket.julia",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": " tryqueens",
+		"c": ", tryqueens",
 		"t": "source.julia",
 		"r": {
 			"dark_plus": "default: #D4D4D4",