diff --git a/extensions/css/cgmanifest.json b/extensions/css/cgmanifest.json
index 7b85089b6b9..93bd8ba0f31 100644
--- a/extensions/css/cgmanifest.json
+++ b/extensions/css/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "microsoft/vscode-css",
 					"repositoryUrl": "https://github.com/microsoft/vscode-css",
-					"commitHash": "a927fe2f73927bf5c25d0b0c4dd0e63d69fd8887"
+					"commitHash": "9a07d76cb0e7a56f9bfc76328a57227751e4adb4"
 				}
 			},
 			"licenseDetail": [
diff --git a/extensions/css/syntaxes/css.tmLanguage.json b/extensions/css/syntaxes/css.tmLanguage.json
index 5ba8bc90b73..484af027c19 100644
--- a/extensions/css/syntaxes/css.tmLanguage.json
+++ b/extensions/css/syntaxes/css.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-css/commit/a927fe2f73927bf5c25d0b0c4dd0e63d69fd8887",
+	"version": "https://github.com/microsoft/vscode-css/commit/9a07d76cb0e7a56f9bfc76328a57227751e4adb4",
 	"name": "CSS",
 	"scopeName": "source.css",
 	"patterns": [
@@ -1401,7 +1401,7 @@
 		"property-keywords": {
 			"patterns": [
 				{
-					"match": "(?xi) (?<![\\w-])\n(above|absolute|active|add|additive|after-edge|alias|all|all-petite-caps|all-scroll|all-small-caps|alpha|alphabetic|alternate|alternate-reverse\n|always|antialiased|auto|auto-fill|auto-fit|auto-pos|available|avoid|avoid-column|avoid-page|avoid-region|backwards|balance|baseline|before-edge|below|bevel\n|bidi-override|blink|block|block-axis|block-start|block-end|bold|bolder|border|border-box|both|bottom|bottom-outside|break-all|break-word|bullets\n|butt|capitalize|caption|cell|center|central|char|circle|clip|clone|close-quote|closest-corner|closest-side|col-resize|collapse|color|color-burn\n|color-dodge|column|column-reverse|common-ligatures|compact|condensed|contain|content|content-box|contents|context-menu|contextual|copy|cover\n|crisp-edges|crispEdges|crosshair|cyclic|dark|darken|dashed|decimal|default|dense|diagonal-fractions|difference|digits|disabled|disc|discretionary-ligatures\n|distribute|distribute-all-lines|distribute-letter|distribute-space|dot|dotted|double|double-circle|downleft|downright|e-resize|each-line|ease|ease-in\n|ease-in-out|ease-out|economy|ellipse|ellipsis|embed|end|evenodd|ew-resize|exact|exclude|exclusion|expanded|extends|extra-condensed|extra-expanded\n|fallback|farthest-corner|farthest-side|fill|fill-available|fill-box|filled|fit-content|fixed|flat|flex|flex-end|flex-start|flip|flow-root|forwards|freeze\n|from-image|full-width|geometricPrecision|georgian|grab|grabbing|grayscale|grid|groove|hand|hanging|hard-light|help|hidden|hide\n|historical-forms|historical-ligatures|horizontal|horizontal-tb|hue|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space\n|ideographic|inactive|infinite|inherit|initial|inline|inline-axis|inline-block|inline-end|inline-flex|inline-grid|inline-list-item|inline-start\n|inline-table|inset|inside|inter-character|inter-ideograph|inter-word|intersect|invert|isolate|isolate-override|italic|jis04|jis78|jis83\n|jis90|justify|justify-all|kannada|keep-all|landscape|large|larger|left|light|lighten|lighter|line|line-edge|line-through|linear|linearRGB\n|lining-nums|list-item|local|loose|lowercase|lr|lr-tb|ltr|luminance|luminosity|main-size|mandatory|manipulation|manual|margin-box|match-parent\n|match-source|mathematical|max-content|medium|menu|message-box|middle|min-content|miter|mixed|move|multiply|n-resize|narrower|ne-resize\n|nearest-neighbor|nesw-resize|newspaper|no-change|no-clip|no-close-quote|no-common-ligatures|no-contextual|no-discretionary-ligatures\n|no-drop|no-historical-ligatures|no-open-quote|no-repeat|none|nonzero|normal|not-allowed|nowrap|ns-resize|numbers|numeric|nw-resize|nwse-resize\n|oblique|oldstyle-nums|open|open-quote|optimizeLegibility|optimizeQuality|optimizeSpeed|optional|ordinal|outset|outside|over|overlay|overline|padding\n|padding-box|page|painted|pan-down|pan-left|pan-right|pan-up|pan-x|pan-y|paused|petite-caps|pixelated|plaintext|pointer|portrait|pre|pre-line\n|pre-wrap|preserve-3d|progress|progressive|proportional-nums|proportional-width|proximity|radial|recto|region|relative|remove|repeat|repeat-[xy]\n|reset-size|reverse|revert|ridge|right|rl|rl-tb|round|row|row-resize|row-reverse|row-severse|rtl|ruby|ruby-base|ruby-base-container|ruby-text\n|ruby-text-container|run-in|running|s-resize|saturation|scale-down|screen|scroll|scroll-position|se-resize|semi-condensed|semi-expanded|separate\n|sesame|show|sideways|sideways-left|sideways-lr|sideways-right|sideways-rl|simplified|slashed-zero|slice|small|small-caps|small-caption|smaller\n|smooth|soft-light|solid|space|space-around|space-between|space-evenly|spell-out|square|sRGB|stacked-fractions|start|static|status-bar|swap\n|step-end|step-start|sticky|stretch|strict|stroke|stroke-box|style|sub|subgrid|subpixel-antialiased|subtract|super|sw-resize|symbolic|table\n|table-caption|table-cell|table-column|table-column-group|table-footer-group|table-header-group|table-row|table-row-group|tabular-nums|tb|tb-rl\n|text|text-after-edge|text-before-edge|text-bottom|text-top|thick|thin|titling-caps|top|top-outside|touch|traditional|transparent|triangle\n|ultra-condensed|ultra-expanded|under|underline|unicase|unset|upleft|uppercase|upright|use-glyph-orientation|use-script|verso|vertical\n|vertical-ideographic|vertical-lr|vertical-rl|vertical-text|view-box|visible|visibleFill|visiblePainted|visibleStroke|w-resize|wait|wavy\n|weight|whitespace|wider|words|wrap|wrap-reverse|x|x-large|x-small|xx-large|xx-small|y|zero|zoom-in|zoom-out)\n(?![\\w-])",
+					"match": "(?xi) (?<![\\w-])\n(above|absolute|active|add|additive|after-edge|alias|all|all-petite-caps|all-scroll|all-small-caps|alpha|alphabetic|alternate|alternate-reverse\n|always|antialiased|auto|auto-fill|auto-fit|auto-pos|available|avoid|avoid-column|avoid-page|avoid-region|backwards|balance|baseline|before-edge|below|bevel\n|bidi-override|blink|block|block-axis|block-start|block-end|bold|bolder|border|border-box|both|bottom|bottom-outside|break-all|break-word|bullets\n|butt|capitalize|caption|cell|center|central|char|circle|clip|clone|close-quote|closest-corner|closest-side|col-resize|collapse|color|color-burn\n|color-dodge|column|column-reverse|common-ligatures|compact|condensed|contain|content|content-box|contents|context-menu|contextual|copy|cover\n|crisp-edges|crispEdges|crosshair|cyclic|dark|darken|dashed|decimal|default|dense|diagonal-fractions|difference|digits|disabled|disc|discretionary-ligatures\n|distribute|distribute-all-lines|distribute-letter|distribute-space|dot|dotted|double|double-circle|downleft|downright|e-resize|each-line|ease|ease-in\n|ease-in-out|ease-out|economy|ellipse|ellipsis|embed|end|evenodd|ew-resize|exact|exclude|exclusion|expanded|extends|extra-condensed|extra-expanded\n|fallback|farthest-corner|farthest-side|fill|fill-available|fill-box|filled|fit-content|fixed|flat|flex|flex-end|flex-start|flip|flow|flow-root|forwards|freeze\n|from-image|full-width|geometricPrecision|georgian|grab|grabbing|grayscale|grid|groove|hand|hanging|hard-light|help|hidden|hide\n|historical-forms|historical-ligatures|horizontal|horizontal-tb|hue|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space\n|ideographic|inactive|infinite|inherit|initial|inline|inline-axis|inline-block|inline-end|inline-flex|inline-grid|inline-list-item|inline-start\n|inline-table|inset|inside|inter-character|inter-ideograph|inter-word|intersect|invert|isolate|isolate-override|italic|jis04|jis78|jis83\n|jis90|justify|justify-all|kannada|keep-all|landscape|large|larger|left|light|lighten|lighter|line|line-edge|line-through|linear|linearRGB\n|lining-nums|list-item|local|loose|lowercase|lr|lr-tb|ltr|luminance|luminosity|main-size|mandatory|manipulation|manual|margin-box|match-parent\n|match-source|mathematical|max-content|medium|menu|message-box|middle|min-content|miter|mixed|move|multiply|n-resize|narrower|ne-resize\n|nearest-neighbor|nesw-resize|newspaper|no-change|no-clip|no-close-quote|no-common-ligatures|no-contextual|no-discretionary-ligatures\n|no-drop|no-historical-ligatures|no-open-quote|no-repeat|none|nonzero|normal|not-allowed|nowrap|ns-resize|numbers|numeric|nw-resize|nwse-resize\n|oblique|oldstyle-nums|open|open-quote|optimizeLegibility|optimizeQuality|optimizeSpeed|optional|ordinal|outset|outside|over|overlay|overline|padding\n|padding-box|page|painted|pan-down|pan-left|pan-right|pan-up|pan-x|pan-y|paused|petite-caps|pixelated|plaintext|pointer|portrait|pre|pre-line\n|pre-wrap|preserve-3d|progress|progressive|proportional-nums|proportional-width|proximity|radial|recto|region|relative|remove|repeat|repeat-[xy]\n|reset-size|reverse|revert|revert-layer|ridge|right|rl|rl-tb|round|row|row-resize|row-reverse|row-severse|rtl|ruby|ruby-base|ruby-base-container|ruby-text\n|ruby-text-container|run-in|running|s-resize|saturation|scale-down|screen|scroll|scroll-position|se-resize|semi-condensed|semi-expanded|separate\n|sesame|show|sideways|sideways-left|sideways-lr|sideways-right|sideways-rl|simplified|slashed-zero|slice|small|small-caps|small-caption|smaller\n|smooth|soft-light|solid|space|space-around|space-between|space-evenly|spell-out|square|sRGB|stacked-fractions|start|static|status-bar|swap\n|step-end|step-start|sticky|stretch|strict|stroke|stroke-box|style|sub|subgrid|subpixel-antialiased|subtract|super|sw-resize|symbolic|table\n|table-caption|table-cell|table-column|table-column-group|table-footer-group|table-header-group|table-row|table-row-group|tabular-nums|tb|tb-rl\n|text|text-after-edge|text-before-edge|text-bottom|text-top|thick|thin|titling-caps|top|top-outside|touch|traditional|transparent|triangle\n|ultra-condensed|ultra-expanded|under|underline|unicase|unset|upleft|uppercase|upright|use-glyph-orientation|use-script|verso|vertical\n|vertical-ideographic|vertical-lr|vertical-rl|vertical-text|view-box|visible|visibleFill|visiblePainted|visibleStroke|w-resize|wait|wavy\n|weight|whitespace|wider|words|wrap|wrap-reverse|x|x-large|x-small|xx-large|xx-small|y|zero|zoom-in|zoom-out)\n(?![\\w-])",
 					"name": "support.constant.property-value.css"
 				},
 				{
diff --git a/extensions/dart/cgmanifest.json b/extensions/dart/cgmanifest.json
index 5558b78af1d..9bd59135d85 100644
--- 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": "e1ac5c446c2531343393adbe8fff9d45d8a7c412"
+					"commitHash": "b2e04fbe2334bfe56940106b652f4c5799affbb1"
 				}
 			},
 			"licenseDetail": [
diff --git a/extensions/dart/syntaxes/dart.tmLanguage.json b/extensions/dart/syntaxes/dart.tmLanguage.json
index b4f80b680bd..30bce5e3021 100644
--- 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/e1ac5c446c2531343393adbe8fff9d45d8a7c412",
+	"version": "https://github.com/dart-lang/dart-syntax-highlight/commit/b2e04fbe2334bfe56940106b652f4c5799affbb1",
 	"name": "Dart",
 	"scopeName": "source.dart",
 	"patterns": [
@@ -58,6 +58,12 @@
 		{
 			"include": "#constants-and-special-vars"
 		},
+		{
+			"include": "#class-identifier-with-optional-factory-method"
+		},
+		{
+			"include": "#function-identifier"
+		},
 		{
 			"include": "#operators"
 		},
@@ -224,12 +230,49 @@
 				{
 					"name": "constant.numeric.dart",
 					"match": "(?<!\\$)\\b((0(x|X)[0-9a-fA-F][0-9a-fA-F_]*)|(([0-9][0-9_]*\\.?[0-9_]*)|(\\.[0-9][0-9_]*))((e|E)(\\+|-)?[0-9][0-9_]*)?)\\b(?!\\$)"
+				}
+			]
+		},
+		"class-identifier-with-optional-factory-method": {
+			"patterns": [
+				{
+					"match": "(?<!\\$)\\b(bool|num|int|double|dynamic)\\b(?!\\$)\\s*(factory\\b)?",
+					"captures": {
+						"1": {
+							"name": "support.class.dart"
+						},
+						"2": {
+							"name": "entity.name.function.dart"
+						}
+					}
 				},
 				{
-					"include": "#class-identifier"
+					"match": "(?<!\\$)\\b(void)\\b(?!\\$)\\s*(factory\\b)?",
+					"captures": {
+						"1": {
+							"name": "storage.type.primitive.dart"
+						},
+						"2": {
+							"name": "entity.name.function.dart"
+						}
+					}
 				},
 				{
-					"include": "#function-identifier"
+					"begin": "(?<![a-zA-Z0-9_$])([_$]*[A-Z][a-zA-Z0-9_$]*)\\b\\s*(factory\\b)?",
+					"end": "(?!<)",
+					"beginCaptures": {
+						"1": {
+							"name": "support.class.dart"
+						},
+						"2": {
+							"name": "entity.name.function.dart"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#type-args"
+						}
+					]
 				}
 			]
 		},
@@ -275,6 +318,10 @@
 							]
 						}
 					}
+				},
+				{
+					"match": "(?<=\\.)new\\b",
+					"name": "entity.name.function.dart"
 				}
 			]
 		},
@@ -330,8 +377,8 @@
 					"match": "(?<!\\$)\\bassert\\b(?!\\$)"
 				},
 				{
-					"name": "keyword.control.new.dart",
-					"match": "(?<!\\$)\\b(new)\\b(?!\\$)"
+					"name": "keyword.new.dart",
+					"match": "(?<![\\$\\.])\\b(new)\\b(?!\\$)"
 				},
 				{
 					"name": "keyword.control.return.dart",
@@ -347,7 +394,7 @@
 				},
 				{
 					"name": "storage.type.primitive.dart",
-					"match": "(?<!\\$)\\b(?:void|var)\\b(?!\\$)"
+					"match": "(?<!\\$)\\b(?:var)\\b(?!\\$)"
 				}
 			]
 		},
@@ -404,6 +451,12 @@
 				{
 					"include": "#constants-and-special-vars"
 				},
+				{
+					"include": "#class-identifier-with-optional-factory-method"
+				},
+				{
+					"include": "#function-identifier"
+				},
 				{
 					"include": "#strings"
 				},
diff --git a/extensions/go/cgmanifest.json b/extensions/go/cgmanifest.json
index b697426969b..bdad000b919 100644
--- a/extensions/go/cgmanifest.json
+++ b/extensions/go/cgmanifest.json
@@ -6,12 +6,12 @@
 				"git": {
 					"name": "go-syntax",
 					"repositoryUrl": "https://github.com/worlpaker/go-syntax",
-					"commitHash": "6e8421faf8f1445512825f63925e54a62106bcf1"
+					"commitHash": "c74e22eb9ef32958e3edd130ea750ce78d8b8241"
 				}
 			},
 			"license": "MIT",
 			"description": "The file syntaxes/go.tmLanguage.json is from https://github.com/worlpaker/go-syntax, which in turn was derived from https://github.com/jeff-hykin/better-go-syntax.",
-			"version": "0.8.5"
+			"version": "0.8.6"
 		}
 	],
 	"version": 1
diff --git a/extensions/go/syntaxes/go.tmLanguage.json b/extensions/go/syntaxes/go.tmLanguage.json
index 72d7df0cb40..b2aec3c4e14 100644
--- a/extensions/go/syntaxes/go.tmLanguage.json
+++ b/extensions/go/syntaxes/go.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/worlpaker/go-syntax/commit/6e8421faf8f1445512825f63925e54a62106bcf1",
+	"version": "https://github.com/worlpaker/go-syntax/commit/c74e22eb9ef32958e3edd130ea750ce78d8b8241",
 	"name": "Go",
 	"scopeName": "source.go",
 	"patterns": [
@@ -1929,12 +1929,12 @@
 				},
 				{
 					"comment": "one line with semicolon(;) without formatting gofmt - single type | property variables and types",
-					"match": "(?:(?<=\\{)((?:\\s*(?:(?:(?:\\w+\\,\\s*)+)?(?:\\w+\\s+))?(?:(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[^\\s/]+)(?:\\;)?))+)\\s*(?=\\}))",
+					"match": "(?:(?<=\\{)((?:\\s*(?:(?:(?:\\w+\\,\\s*)+)?(?:\\w+\\s+))?(?:(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[^\\s/\\`\"]+)(?:\\;)?))+)\\s*(?=\\}))",
 					"captures": {
 						"1": {
 							"patterns": [
 								{
-									"match": "(?:((?:(?:\\w+\\,\\s*)+)?(?:\\w+\\s+))?((?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[^\\s/]+)(?:\\;)?))",
+									"match": "(?:((?:(?:\\w+\\,\\s*)+)?(?:\\w+\\s+))?((?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[^\\s/\\`\"]+)(?:\\;)?))",
 									"captures": {
 										"1": {
 											"patterns": [
diff --git a/extensions/php/cgmanifest.json b/extensions/php/cgmanifest.json
index 090bdf642f9..1fe92816e2c 100644
--- a/extensions/php/cgmanifest.json
+++ b/extensions/php/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "language-php",
 					"repositoryUrl": "https://github.com/KapitanOczywisty/language-php",
-					"commitHash": "6941b924add3b2587a5be789248176edf5f14595"
+					"commitHash": "a0f3d9a3b0d017181455ed515e48a36607a90e3b"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/php/syntaxes/php.tmLanguage.json b/extensions/php/syntaxes/php.tmLanguage.json
index efb122c98d3..afa1a5bbb67 100644
--- a/extensions/php/syntaxes/php.tmLanguage.json
+++ b/extensions/php/syntaxes/php.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/KapitanOczywisty/language-php/commit/6941b924add3b2587a5be789248176edf5f14595",
+	"version": "https://github.com/KapitanOczywisty/language-php/commit/a0f3d9a3b0d017181455ed515e48a36607a90e3b",
 	"scopeName": "source.php",
 	"patterns": [
 		{
@@ -2464,7 +2464,7 @@
 							"name": "punctuation.definition.arguments.begin.bracket.round.php"
 						}
 					},
-					"end": "\\)",
+					"end": "\\)|(?=\\?>)",
 					"endCaptures": {
 						"0": {
 							"name": "punctuation.definition.arguments.end.bracket.round.php"
@@ -2536,16 +2536,33 @@
 			]
 		},
 		"invoke-call": {
-			"captures": {
+			"begin": "(?i)((\\$+)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\\s*(\\()",
+			"beginCaptures": {
 				"1": {
 					"name": "variable.other.php"
 				},
 				"2": {
 					"name": "punctuation.definition.variable.php"
+				},
+				"3": {
+					"name": "punctuation.definition.arguments.begin.bracket.round.php"
 				}
 			},
-			"match": "(?i)((\\$+)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)(?=\\s*\\()",
-			"name": "meta.function-call.invoke.php"
+			"end": "\\)|(?=\\?>)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.arguments.end.bracket.round.php"
+				}
+			},
+			"name": "meta.function-call.invoke.php",
+			"patterns": [
+				{
+					"include": "#named-arguments"
+				},
+				{
+					"include": "$self"
+				}
+			]
 		},
 		"namespace": {
 			"begin": "(?i)(?:(namespace)|[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)?(\\\\)",
diff --git a/extensions/ruby/cgmanifest.json b/extensions/ruby/cgmanifest.json
index 5d7a9662061..0fb779250dd 100644
--- a/extensions/ruby/cgmanifest.json
+++ b/extensions/ruby/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "Shopify/ruby-lsp",
 					"repositoryUrl": "https://github.com/Shopify/ruby-lsp",
-					"commitHash": "59da6a0ae3409437474b85d0daa5535f1878699d"
+					"commitHash": "ba41f8b4f9677fb14c1ecbe15d73ebe12a0d3859"
 				}
 			},
 			"licenseDetail": [
diff --git a/extensions/ruby/syntaxes/ruby.tmLanguage.json b/extensions/ruby/syntaxes/ruby.tmLanguage.json
index f5e3f2b0c0d..8cda18871b5 100644
--- a/extensions/ruby/syntaxes/ruby.tmLanguage.json
+++ b/extensions/ruby/syntaxes/ruby.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/Shopify/ruby-lsp/commit/59da6a0ae3409437474b85d0daa5535f1878699d",
+	"version": "https://github.com/Shopify/ruby-lsp/commit/ba41f8b4f9677fb14c1ecbe15d73ebe12a0d3859",
 	"name": "Ruby",
 	"scopeName": "source.ruby",
 	"patterns": [
@@ -1583,7 +1583,12 @@
 		{
 			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)HTML)\\b\\1))",
 			"comment": "Heredoc with embedded HTML",
-			"end": "(?!\\G)",
+			"end": "^\\s*((?:[_\\w]+_|)HTML)$\\n?",
+			"endCaptures": {
+				"0": {
+					"name": "string.definition.end.ruby"
+				}
+			},
 			"name": "meta.embedded.block.html",
 			"patterns": [
 				{
@@ -1594,12 +1599,7 @@
 						}
 					},
 					"contentName": "text.html",
-					"end": "^\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "string.definition.end.ruby"
-						}
-					},
+					"while": "^(?!\\s*((?:[_\\w]+_|)HTML)\\s*$)",
 					"patterns": [
 						{
 							"include": "#heredoc"
@@ -1620,7 +1620,12 @@
 		{
 			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)HAML)\\b\\1))",
 			"comment": "Heredoc with embedded HAML",
-			"end": "(?!\\G)",
+			"end": "^\\s*((?:[_\\w]+_|)HAML)$\\n?",
+			"endCaptures": {
+				"0": {
+					"name": "string.definition.end.ruby"
+				}
+			},
 			"name": "meta.embedded.block.haml",
 			"patterns": [
 				{
@@ -1631,12 +1636,7 @@
 						}
 					},
 					"contentName": "text.haml",
-					"end": "^\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "string.definition.end.ruby"
-						}
-					},
+					"while": "^(?!\\s*((?:[_\\w]+_|)HAML)\\s*$)",
 					"patterns": [
 						{
 							"include": "#heredoc"
@@ -1657,7 +1657,12 @@
 		{
 			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)XML)\\b\\1))",
 			"comment": "Heredoc with embedded XML",
-			"end": "(?!\\G)",
+			"end": "^\\s*((?:[_\\w]+_|)XML)$\\n?",
+			"endCaptures": {
+				"0": {
+					"name": "string.definition.end.ruby"
+				}
+			},
 			"name": "meta.embedded.block.xml",
 			"patterns": [
 				{
@@ -1668,12 +1673,7 @@
 						}
 					},
 					"contentName": "text.xml",
-					"end": "^\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "string.definition.end.ruby"
-						}
-					},
+					"while": "^(?!\\s*((?:[_\\w]+_|)XML)\\s*$)",
 					"patterns": [
 						{
 							"include": "#heredoc"
@@ -1694,7 +1694,12 @@
 		{
 			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)SQL)\\b\\1))",
 			"comment": "Heredoc with embedded SQL",
-			"end": "(?!\\G)",
+			"end": "^\\s*((?:[_\\w]+_|)SQL)$\\n?",
+			"endCaptures": {
+				"0": {
+					"name": "string.definition.end.ruby"
+				}
+			},
 			"name": "meta.embedded.block.sql",
 			"patterns": [
 				{
@@ -1705,12 +1710,7 @@
 						}
 					},
 					"contentName": "source.sql",
-					"end": "^\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "string.definition.end.ruby"
-						}
-					},
+					"while": "^(?!\\s*((?:[_\\w]+_|)SQL)\\s*$)",
 					"patterns": [
 						{
 							"include": "#heredoc"
@@ -1731,7 +1731,12 @@
 		{
 			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)(?:GRAPHQL|GQL))\\b\\1))",
 			"comment": "Heredoc with embedded GraphQL",
-			"end": "(?!\\G)",
+			"end": "^\\s*((?:[_\\w]+_|)(?:GRAPHQL|GQL))$\\n?",
+			"endCaptures": {
+				"0": {
+					"name": "string.definition.end.ruby"
+				}
+			},
 			"name": "meta.embedded.block.graphql",
 			"patterns": [
 				{
@@ -1742,12 +1747,7 @@
 						}
 					},
 					"contentName": "source.graphql",
-					"end": "^\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "string.definition.end.ruby"
-						}
-					},
+					"while": "^(?!\\s*((?:[_\\w]+_|)(?:GRAPHQL|GQL))\\s*$)",
 					"patterns": [
 						{
 							"include": "#heredoc"
@@ -1768,7 +1768,12 @@
 		{
 			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)CSS)\\b\\1))",
 			"comment": "Heredoc with embedded CSS",
-			"end": "(?!\\G)",
+			"end": "^\\s*((?:[_\\w]+_|)CSS)$\\n?",
+			"endCaptures": {
+				"0": {
+					"name": "string.definition.end.ruby"
+				}
+			},
 			"name": "meta.embedded.block.css",
 			"patterns": [
 				{
@@ -1779,12 +1784,7 @@
 						}
 					},
 					"contentName": "source.css",
-					"end": "^\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "string.definition.end.ruby"
-						}
-					},
+					"while": "^(?!\\s*((?:[_\\w]+_|)CSS)\\s*$)",
 					"patterns": [
 						{
 							"include": "#heredoc"
@@ -1805,7 +1805,12 @@
 		{
 			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)CPP)\\b\\1))",
 			"comment": "Heredoc with embedded C++",
-			"end": "(?!\\G)",
+			"end": "^\\s*((?:[_\\w]+_|)CPP)$\\n?",
+			"endCaptures": {
+				"0": {
+					"name": "string.definition.end.ruby"
+				}
+			},
 			"name": "meta.embedded.block.cpp",
 			"patterns": [
 				{
@@ -1816,12 +1821,7 @@
 						}
 					},
 					"contentName": "source.cpp",
-					"end": "^\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "string.definition.end.ruby"
-						}
-					},
+					"while": "^(?!\\s*((?:[_\\w]+_|)CPP)\\s*$)",
 					"patterns": [
 						{
 							"include": "#heredoc"
@@ -1842,7 +1842,12 @@
 		{
 			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)C)\\b\\1))",
 			"comment": "Heredoc with embedded C",
-			"end": "(?!\\G)",
+			"end": "^\\s*((?:[_\\w]+_|)C)$\\n?",
+			"endCaptures": {
+				"0": {
+					"name": "string.definition.end.ruby"
+				}
+			},
 			"name": "meta.embedded.block.c",
 			"patterns": [
 				{
@@ -1853,12 +1858,7 @@
 						}
 					},
 					"contentName": "source.c",
-					"end": "^\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "string.definition.end.ruby"
-						}
-					},
+					"while": "^(?!\\s*((?:[_\\w]+_|)C)\\s*$)",
 					"patterns": [
 						{
 							"include": "#heredoc"
@@ -1879,7 +1879,12 @@
 		{
 			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)(?:JS|JAVASCRIPT))\\b\\1))",
 			"comment": "Heredoc with embedded Javascript",
-			"end": "(?!\\G)",
+			"end": "^\\s*((?:[_\\w]+_|)(?:JS|JAVASCRIPT))$\\n?",
+			"endCaptures": {
+				"0": {
+					"name": "string.definition.end.ruby"
+				}
+			},
 			"name": "meta.embedded.block.js",
 			"patterns": [
 				{
@@ -1890,12 +1895,7 @@
 						}
 					},
 					"contentName": "source.js",
-					"end": "^\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "string.definition.end.ruby"
-						}
-					},
+					"while": "^(?!\\s*((?:[_\\w]+_|)(?:JS|JAVASCRIPT))\\s*$)",
 					"patterns": [
 						{
 							"include": "#heredoc"
@@ -1916,7 +1916,12 @@
 		{
 			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)JQUERY)\\b\\1))",
 			"comment": "Heredoc with embedded jQuery Javascript",
-			"end": "(?!\\G)",
+			"end": "^\\s*((?:[_\\w]+_|)JQUERY)$\\n?",
+			"endCaptures": {
+				"0": {
+					"name": "string.definition.end.ruby"
+				}
+			},
 			"name": "meta.embedded.block.js.jquery",
 			"patterns": [
 				{
@@ -1927,12 +1932,7 @@
 						}
 					},
 					"contentName": "source.js.jquery",
-					"end": "^\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "string.definition.end.ruby"
-						}
-					},
+					"while": "^(?!\\s*((?:[_\\w]+_|)JQUERY)\\s*$)",
 					"patterns": [
 						{
 							"include": "#heredoc"
@@ -1953,7 +1953,12 @@
 		{
 			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)(?:SH|SHELL))\\b\\1))",
 			"comment": "Heredoc with embedded Shell",
-			"end": "(?!\\G)",
+			"end": "^\\s*((?:[_\\w]+_|)(?:SH|SHELL))$\\n?",
+			"endCaptures": {
+				"0": {
+					"name": "string.definition.end.ruby"
+				}
+			},
 			"name": "meta.embedded.block.shell",
 			"patterns": [
 				{
@@ -1964,12 +1969,7 @@
 						}
 					},
 					"contentName": "source.shell",
-					"end": "^\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "string.definition.end.ruby"
-						}
-					},
+					"while": "^(?!\\s*((?:[_\\w]+_|)(?:SH|SHELL))\\s*$)",
 					"patterns": [
 						{
 							"include": "#heredoc"
@@ -1990,7 +1990,12 @@
 		{
 			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)LUA)\\b\\1))",
 			"comment": "Heredoc with embedded Lua",
-			"end": "(?!\\G)",
+			"end": "^\\s*((?:[_\\w]+_|)LUA)$\\n?",
+			"endCaptures": {
+				"0": {
+					"name": "string.definition.end.ruby"
+				}
+			},
 			"name": "meta.embedded.block.lua",
 			"patterns": [
 				{
@@ -2001,12 +2006,7 @@
 						}
 					},
 					"contentName": "source.lua",
-					"end": "^\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "string.definition.end.ruby"
-						}
-					},
+					"while": "^(?!\\s*((?:[_\\w]+_|)LUA)\\s*$)",
 					"patterns": [
 						{
 							"include": "#heredoc"
@@ -2027,7 +2027,12 @@
 		{
 			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)RUBY)\\b\\1))",
 			"comment": "Heredoc with embedded Ruby",
-			"end": "(?!\\G)",
+			"end": "^\\s*((?:[_\\w]+_|)RUBY)$\\n?",
+			"endCaptures": {
+				"0": {
+					"name": "string.definition.end.ruby"
+				}
+			},
 			"name": "meta.embedded.block.ruby",
 			"patterns": [
 				{
@@ -2038,12 +2043,7 @@
 						}
 					},
 					"contentName": "source.ruby",
-					"end": "^\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "string.definition.end.ruby"
-						}
-					},
+					"while": "^(?!\\s*((?:[_\\w]+_|)RUBY)\\s*$)",
 					"patterns": [
 						{
 							"include": "#heredoc"
@@ -2064,7 +2064,12 @@
 		{
 			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)(?:YAML|YML))\\b\\1))",
 			"comment": "Heredoc with embedded YAML",
-			"end": "(?!\\G)",
+			"end": "^\\s*((?:[_\\w]+_|)(?:YAML|YML))$\\n?",
+			"endCaptures": {
+				"0": {
+					"name": "string.definition.end.ruby"
+				}
+			},
 			"name": "meta.embedded.block.yaml",
 			"patterns": [
 				{
@@ -2075,12 +2080,7 @@
 						}
 					},
 					"contentName": "source.yaml",
-					"end": "^\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "string.definition.end.ruby"
-						}
-					},
+					"while": "^(?!\\s*((?:[_\\w]+_|)(?:YAML|YML))\\s*$)",
 					"patterns": [
 						{
 							"include": "#heredoc"
@@ -2101,7 +2101,12 @@
 		{
 			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)SLIM)\\b\\1))",
 			"comment": "Heredoc with embedded Slim",
-			"end": "(?!\\G)",
+			"end": "^\\s*((?:[_\\w]+_|)SLIM)$\\n?",
+			"endCaptures": {
+				"0": {
+					"name": "string.definition.end.ruby"
+				}
+			},
 			"name": "meta.embedded.block.slim",
 			"patterns": [
 				{
@@ -2112,12 +2117,7 @@
 						}
 					},
 					"contentName": "text.slim",
-					"end": "^\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "string.definition.end.ruby"
-						}
-					},
+					"while": "^(?!\\s*((?:[_\\w]+_|)SLIM)\\s*$)",
 					"patterns": [
 						{
 							"include": "#heredoc"
diff --git a/extensions/swift/cgmanifest.json b/extensions/swift/cgmanifest.json
index ecd2705da2a..02ea0744ecd 100644
--- a/extensions/swift/cgmanifest.json
+++ b/extensions/swift/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "jtbandes/swift-tmlanguage",
 					"repositoryUrl": "https://github.com/jtbandes/swift-tmlanguage",
-					"commitHash": "45ac01d47c6d63402570c2c36bcfbadbd1c7bca6"
+					"commitHash": "3fca2fa10f7dc962d19ee617b17844d6eecfa2cb"
 				}
 			},
 			"license": "MIT"
diff --git a/extensions/swift/syntaxes/swift.tmLanguage.json b/extensions/swift/syntaxes/swift.tmLanguage.json
index a8bbe5d00b4..d52cabb836b 100644
--- a/extensions/swift/syntaxes/swift.tmLanguage.json
+++ b/extensions/swift/syntaxes/swift.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/jtbandes/swift-tmlanguage/commit/45ac01d47c6d63402570c2c36bcfbadbd1c7bca6",
+	"version": "https://github.com/jtbandes/swift-tmlanguage/commit/3fca2fa10f7dc962d19ee617b17844d6eecfa2cb",
 	"name": "Swift",
 	"scopeName": "source.swift",
 	"comment": "See swift.tmbundle/grammar-test.swift for test cases.",
@@ -3848,7 +3848,7 @@
 				},
 				{
 					"name": "string.quoted.double.block.raw.swift",
-					"begin": "#\"\"\"",
+					"begin": "#\"\"\"(?!#)(?=(?:[^\"]|\"(?!#))*$)",
 					"end": "\"\"\"#(#*)",
 					"beginCaptures": {
 						"0": {
@@ -3884,7 +3884,7 @@
 				},
 				{
 					"name": "string.quoted.double.block.raw.swift",
-					"begin": "(##+)\"\"\"",
+					"begin": "(?<!#)(##+)\"\"\"(?!\\1)(?=(?:[^\"]|\"(?!\\1))*$)",
 					"end": "\"\"\"\\1(#*)",
 					"beginCaptures": {
 						"0": {
@@ -3936,7 +3936,7 @@
 				{
 					"comment": "SE-0168: raw string literals (more than one #, grammar limitations prevent us from supporting escapes)",
 					"name": "string.quoted.double.single-line.raw.swift",
-					"begin": "(##+)\"",
+					"begin": "(?<!#)(##+)\"",
 					"end": "\"\\1(#*)",
 					"beginCaptures": {
 						"0": {