@codingame/monaco-editor-wrapper 3.9.2 → 3.9.3

package/dist/shell-unix-bash.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/jeff-hykin/better-shell-syntax/commit/b05618771b35b4baa25661dff91170b4924fdac8";
+var version = "https://github.com/jeff-hykin/better-shell-syntax/commit/1bad17d8badf6283125aaa7c31be06ba64146a0f";
 var name = "Shell Script";
 var scopeName = "source.shell";
 var patterns = [
@@ -13,32 +13,35 @@ var patterns = [
 ];
 var repository = {
 	alias_statement: {
-		begin: "(alias)(?:\\s)+\\s*+((?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w))(?:(\\[)((?:(?:(?:\\$)?(?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w)|@)|\\*))(\\]))?(?:(?:(\\=)|(\\+\\=))|(\\-\\=))",
-		end: "(?:(?:(?:(?:(?:(;)|(&&))|(\\|\\|))|(&))|\\n)|(?= |$))",
+		begin: "(alias)[ \\t]*+[ \\t]*+(?:((?<=^|;|&|[ \\t])(?:export|declare|typeset|local|readonly)(?=[ \\t]|;|&|$))[ \\t]*+)?((?<!\\w)[a-zA-Z_0-9-]+(?!\\w))(?:(\\[)((?:(?:(?:\\$)?(?<!\\w)[a-zA-Z_0-9-]+(?!\\w)|@)|\\*))(\\]))?(?:(?:(\\=)|(\\+\\=))|(\\-\\=))",
+		end: "(?:(?= |\\t|$)|(?:(?:(?:(?:(;)|(&&))|(\\|\\|))|(&))|\\n))",
 		beginCaptures: {
 			"1": {
 				name: "storage.type.alias.shell"
 			},
 			"2": {
-				name: "variable.other.assignment.shell"
+				name: "storage.modifier.$2.shell"
 			},
 			"3": {
-				name: "punctuation.definition.array.access.shell"
+				name: "variable.other.assignment.shell"
 			},
 			"4": {
-				name: "variable.other.assignment.shell"
+				name: "punctuation.definition.array.access.shell"
 			},
 			"5": {
-				name: "punctuation.definition.array.access.shell"
+				name: "variable.other.assignment.shell"
 			},
 			"6": {
-				name: "keyword.operator.assignment.shell"
+				name: "punctuation.definition.array.access.shell"
 			},
 			"7": {
-				name: "keyword.operator.assignment.compound.shell"
+				name: "keyword.operator.assignment.shell"
 			},
 			"8": {
 				name: "keyword.operator.assignment.compound.shell"
+			},
+			"9": {
+				name: "keyword.operator.assignment.compound.shell"
 			}
 		},
 		endCaptures: {
@@ -58,13 +61,13 @@ var repository = {
 		name: "meta.expression.assignment.shell",
 		patterns: [
 			{
-				include: "#statement_context"
+				include: "#normal_statement_context"
 			}
 		]
 	},
 	argument: {
-		begin: "\\s++(?!(?:%|&|\\||\\(|\\[|#|\\n|$|;))",
-		end: "(?=\\s|;|\\||&|$|\\n|\\)|\\`)",
+		begin: "[ \\t]++(?!(?:&|\\||\\(|\\[|#|\\n|$|;))",
+		end: "(?= |\\t|;|\\||&|$|\\n|\\)|\\`)",
 		beginCaptures: {
 		},
 		endCaptures: {
@@ -82,9 +85,10 @@ var repository = {
 	argument_context: {
 		patterns: [
 			{
-				match: "[^ \n'&;<>\\(\\)\\$`\\\\\"\\|]+(?!>)",
+				match: "[ \\t]*+([^ \t\n'&;<>\\(\\)\\$`\\\\\"\\|]+(?!>))",
 				captures: {
-					"0": {
+					"1": {
+						name: "string.unquoted.argument.shell",
 						patterns: [
 							{
 								match: "\\*",
@@ -106,60 +110,141 @@ var repository = {
 							}
 						]
 					}
-				},
-				name: "string.unquoted.argument.shell"
+				}
 			},
 			{
-				include: "#statement_context"
+				include: "#normal_statement_context"
 			}
 		]
 	},
 	assignment: {
-		begin: "\\s*+((?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w))(?:(\\[)((?:(?:(?:\\$)?(?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w)|@)|\\*))(\\]))?(?:(?:(\\=)|(\\+\\=))|(\\-\\=))",
-		end: "(?:(?:(?:(?:(?:(;)|(&&))|(\\|\\|))|(&))|\\n)|(?= |$))",
-		beginCaptures: {
-			"1": {
-				name: "variable.other.assignment.shell"
-			},
-			"2": {
-				name: "punctuation.definition.array.access.shell"
-			},
-			"3": {
-				name: "variable.other.assignment.shell"
-			},
-			"4": {
-				name: "punctuation.definition.array.access.shell"
-			},
-			"5": {
-				name: "keyword.operator.assignment.shell"
-			},
-			"6": {
-				name: "keyword.operator.assignment.compound.shell"
+		patterns: [
+			{
+				begin: "[ \\t]*+(?:((?<=^|;|&|[ \\t])(?:export|declare|typeset|local|readonly)(?=[ \\t]|;|&|$))[ \\t]*+)?((?<!\\w)[a-zA-Z_0-9-]+(?!\\w))(?:(\\[)((?:(?:(?:\\$)?(?<!\\w)[a-zA-Z_0-9-]+(?!\\w)|@)|\\*))(\\]))?(?:(?:(\\=)|(\\+\\=))|(\\-\\=))[ \\t]*+(\\()",
+				end: "\\)",
+				beginCaptures: {
+					"1": {
+						name: "storage.modifier.$1.shell"
+					},
+					"2": {
+						name: "variable.other.assignment.shell"
+					},
+					"3": {
+						name: "punctuation.definition.array.access.shell"
+					},
+					"4": {
+						name: "variable.other.assignment.shell"
+					},
+					"5": {
+						name: "punctuation.definition.array.access.shell"
+					},
+					"6": {
+						name: "keyword.operator.assignment.shell"
+					},
+					"7": {
+						name: "keyword.operator.assignment.compound.shell"
+					},
+					"8": {
+						name: "keyword.operator.assignment.compound.shell"
+					},
+					"9": {
+						name: "punctuation.shell"
+					}
+				},
+				endCaptures: {
+					"0": {
+						name: "punctuation.shell"
+					}
+				},
+				name: "meta.expression.assignment.shell",
+				patterns: [
+					{
+						include: "#comment"
+					},
+					{
+						include: "#argument_context"
+					}
+				]
 			},
-			"7": {
-				name: "keyword.operator.assignment.compound.shell"
+			{
+				begin: "[ \\t]*+(?:((?<=^|;|&|[ \\t])(?:export|declare|typeset|local|readonly)(?=[ \\t]|;|&|$))[ \\t]*+)?((?<!\\w)[a-zA-Z_0-9-]+(?!\\w))(?:(\\[)((?:(?:(?:\\$)?(?<!\\w)[a-zA-Z_0-9-]+(?!\\w)|@)|\\*))(\\]))?(?:(?:(\\=)|(\\+\\=))|(\\-\\=))",
+				end: "(?:(?= |\\t|$)|(?:(?:(?:(?:(;)|(&&))|(\\|\\|))|(&))|\\n))",
+				beginCaptures: {
+					"1": {
+						name: "storage.modifier.$1.shell"
+					},
+					"2": {
+						name: "variable.other.assignment.shell"
+					},
+					"3": {
+						name: "punctuation.definition.array.access.shell"
+					},
+					"4": {
+						name: "variable.other.assignment.shell"
+					},
+					"5": {
+						name: "punctuation.definition.array.access.shell"
+					},
+					"6": {
+						name: "keyword.operator.assignment.shell"
+					},
+					"7": {
+						name: "keyword.operator.assignment.compound.shell"
+					},
+					"8": {
+						name: "keyword.operator.assignment.compound.shell"
+					}
+				},
+				endCaptures: {
+					"1": {
+						name: "punctuation.terminator.statement.semicolon.shell"
+					},
+					"2": {
+						name: "punctuation.separator.statement.and.shell"
+					},
+					"3": {
+						name: "punctuation.separator.statement.or.shell"
+					},
+					"4": {
+						name: "punctuation.separator.statement.background.shell"
+					}
+				},
+				name: "meta.expression.assignment.shell",
+				patterns: [
+					{
+						include: "#comment"
+					},
+					{
+						include: "#argument_context"
+					}
+				]
 			}
-		},
-		endCaptures: {
+		]
+	},
+	basic_command_name: {
+		match: "(?!(?:!|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|[ \\t]))(?!foreach\\b(?!\\/)|select\\b(?!\\/)|repeat\\b(?!\\/)|until\\b(?!\\/)|while\\b(?!\\/)|case\\b(?!\\/)|done\\b(?!\\/)|elif\\b(?!\\/)|else\\b(?!\\/)|esac\\b(?!\\/)|then\\b(?!\\/)|for\\b(?!\\/)|end\\b(?!\\/)|in\\b(?!\\/)|fi\\b(?!\\/)|do\\b(?!\\/)|if\\b(?!\\/))(?:((?<=^|;|&|[ \\t])(?:export|declare|typeset|local|readonly)(?=[ \\t]|;|&|$))|((?!\"|'|\\\\\\n?$)[^!'\" \\t\\n\\r]+?))(?:(?= |\\t)|(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|[ \\t]*#|\\])(?<!\\\\))",
+		captures: {
 			"1": {
-				name: "punctuation.terminator.statement.semicolon.shell"
+				name: "storage.modifier.$1.shell"
 			},
 			"2": {
-				name: "punctuation.separator.statement.and.shell"
-			},
-			"3": {
-				name: "punctuation.separator.statement.or.shell"
-			},
-			"4": {
-				name: "punctuation.separator.statement.background.shell"
+				name: "entity.name.function.call.shell entity.name.command.shell",
+				patterns: [
+					{
+						match: "(?<!\\w)(?:return|break)(?!\\w)",
+						name: "keyword.control.$0.shell"
+					},
+					{
+						match: "(?<!\\w)(?:unfunction|unsetopt|autoload|suspend|bindkey|builtin|getopts|command|declare|unalias|history|unlimit|typeset|source|printf|unhash|disown|ulimit|return|which|alias|break|false|print|shift|times|umask|umask|unset|read|type|exec|eval|wait|echo|dirs|jobs|kill|hash|stat|exit|test|trap|true|let|set|pwd|cd|fg|bg|fc|:|\\.)(?!\\/)(?!\\w)",
+						name: "support.function.builtin.shell"
+					},
+					{
+						include: "#variable"
+					}
+				]
 			}
 		},
-		name: "meta.expression.assignment.shell",
-		patterns: [
-			{
-				include: "#argument_context"
-			}
-		]
+		name: "meta.statement.command.name.basic.shell"
 	},
 	block_comment: {
 		begin: "\\s*+(\\/\\*)",
@@ -239,89 +324,8 @@ var repository = {
 			}
 		]
 	},
-	command_call: {
-		begin: "(?!^ *+$)(?<=(?:^|;|\\||&|!|\\(|\\{|\\`))\\s*+(?!nocorrect\\W|nocorrect\\$|readonly\\W|readonly\\$|function\\W|function\\$|foreach\\W|foreach\\$|coproc\\W|coproc\\$|logout\\W|logout\\$|export\\W|export\\$|select\\W|select\\$|repeat\\W|repeat\\$|pushd\\W|pushd\\$|until\\W|until\\$|while\\W|while\\$|local\\W|local\\$|case\\W|case\\$|done\\W|done\\$|elif\\W|elif\\$|else\\W|else\\$|esac\\W|esac\\$|popd\\W|popd\\$|then\\W|then\\$|time\\W|time\\$|for\\W|for\\$|end\\W|end\\$|fi\\W|fi\\$|do\\W|do\\$|in\\W|in\\$|if\\W|if\\$)",
-		end: "(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|#|\\])(?<!\\\\)",
-		beginCaptures: {
-		},
-		endCaptures: {
-		},
-		name: "meta.statement.shell",
-		patterns: [
-			{
-				begin: "\\s*+(?!(?:!|%|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|\\s))(.+?)(?:(?=\\s)|(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|#|\\])(?<!\\\\))",
-				end: "(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|#|\\])(?<!\\\\)",
-				beginCaptures: {
-					"0": {
-						name: "meta.command_name.shell"
-					},
-					"1": {
-						name: "entity.name.command.shell",
-						patterns: [
-							{
-								match: "(?<!\\w)(?:return|break)(?!\\w)",
-								name: "keyword.control.$0.shell"
-							},
-							{
-								match: "(?<!\\w)(?:unfunction|unsetopt|autoload|unlimit|bindkey|builtin|command|getopts|history|declare|unalias|typeset|suspend|return|source|ulimit|unhash|disown|which|alias|break|false|print|shift|times|umask|umask|unset|read|type|exec|eval|wait|echo|dirs|hash|jobs|kill|stat|exit|test|trap|true|pwd|let|set|cd|fg|bg|fc|:|\\.)(?!\\w)",
-								name: "support.function.builtin.shell"
-							},
-							{
-								include: "#variable"
-							}
-						]
-					}
-				},
-				endCaptures: {
-				},
-				name: "meta.command.shell",
-				patterns: [
-					{
-						include: "#line_continuation"
-					},
-					{
-						include: "#option"
-					},
-					{
-						include: "#argument"
-					},
-					{
-						include: "#statement_context"
-					}
-				]
-			},
-			{
-				include: "#line_continuation"
-			},
-			{
-				include: "#statement_context"
-			}
-		]
-	},
-	command_name: {
-		match: "\\s*+(?!(?:!|%|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|\\s))(.+?)(?:(?=\\s)|(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|#|\\])(?<!\\\\))",
-		captures: {
-			"1": {
-				name: "entity.name.command.shell",
-				patterns: [
-					{
-						match: "(?<!\\w)(?:return|break)(?!\\w)",
-						name: "keyword.control.$0.shell"
-					},
-					{
-						match: "(?<!\\w)(?:unfunction|unsetopt|autoload|unlimit|bindkey|builtin|command|getopts|history|declare|unalias|typeset|suspend|return|source|ulimit|unhash|disown|which|alias|break|false|print|shift|times|umask|umask|unset|read|type|exec|eval|wait|echo|dirs|hash|jobs|kill|stat|exit|test|trap|true|pwd|let|set|cd|fg|bg|fc|:|\\.)(?!\\w)",
-						name: "support.function.builtin.shell"
-					},
-					{
-						include: "#variable"
-					}
-				]
-			}
-		},
-		name: "meta.command_name.shell"
-	},
 	comment: {
-		match: "(?<=^|\\s)(?:((#!).*)|((#).*))",
+		match: "(?:^|[ \\t]++)(?:((#!).*)|((#).*))",
 		captures: {
 			"1": {
 				name: "comment.line.number-sign.shell meta.shebang.shell"
@@ -434,6 +438,42 @@ var repository = {
 			}
 		]
 	},
+	continuation_of_double_quoted_command_name: {
+		begin: "\\G(?<=\")",
+		end: "\"",
+		beginCaptures: {
+		},
+		endCaptures: {
+			"0": {
+				name: "string.quoted.double.shell punctuation.definition.string.end.shell entity.name.function.call.shell entity.name.command.shell"
+			}
+		},
+		contentName: "meta.statement.command.name.continuation string.quoted.double entity.name.function.call entity.name.command",
+		patterns: [
+			{
+				match: "\\\\[\\$\\n`\"\\\\]",
+				name: "constant.character.escape.shell"
+			},
+			{
+				include: "#variable"
+			},
+			{
+				include: "#interpolation"
+			}
+		]
+	},
+	continuation_of_single_quoted_command_name: {
+		begin: "\\G(?<=')",
+		end: "'",
+		beginCaptures: {
+		},
+		endCaptures: {
+			"0": {
+				name: "string.quoted.single.shell punctuation.definition.string.end.shell entity.name.function.call.shell entity.name.command.shell"
+			}
+		},
+		contentName: "meta.statement.command.name.continuation string.quoted.single entity.name.function.call entity.name.command"
+	},
 	custom_command_names: {
 		patterns: [
 		]
@@ -442,32 +482,71 @@ var repository = {
 		patterns: [
 		]
 	},
+	double_quote_context: {
+		patterns: [
+			{
+				match: "\\\\[\\$`\"\\\\\\n]",
+				name: "constant.character.escape.shell"
+			},
+			{
+				include: "#variable"
+			},
+			{
+				include: "#interpolation"
+			}
+		]
+	},
 	double_quote_escape_char: {
 		match: "\\\\[\\$`\"\\\\\\n]",
 		name: "constant.character.escape.shell"
 	},
-	"function-definition": {
+	function_definition: {
+		begin: "[ \\t]*+(?:(\\bfunction\\b)[ \\t]*+([^ \\t\\n\\r\\(\\)=]+)(?:(\\()[ \\t]*+(\\)))?|([^ \\t\\n\\r\\(\\)=]+)[ \\t]*+(\\()[ \\t]*+(\\)))",
+		end: "(?<=\\}|\\))",
+		beginCaptures: {
+			"1": {
+				name: "storage.type.function.shell"
+			},
+			"2": {
+				name: "entity.name.function.shell"
+			},
+			"3": {
+				name: "punctuation.definition.arguments.shell"
+			},
+			"4": {
+				name: "punctuation.definition.arguments.shell"
+			},
+			"5": {
+				name: "entity.name.function.shell"
+			},
+			"6": {
+				name: "punctuation.definition.arguments.shell"
+			},
+			"7": {
+				name: "punctuation.definition.arguments.shell"
+			}
+		},
+		endCaptures: {
+		},
+		name: "meta.function.shell",
 		patterns: [
 			{
-				begin: "(?:^\\s*|(?<=^|;|&|\\s))(function)\\s+([^\\s\\\\]+)(?:\\s*(\\(\\)))?",
+				match: "\\G(?:\\t| |\\n)"
+			},
+			{
+				begin: "\\{",
+				end: "\\}",
 				beginCaptures: {
-					"1": {
-						name: "storage.type.function.shell"
-					},
-					"2": {
-						name: "entity.name.function.shell"
-					},
-					"3": {
-						name: "punctuation.definition.arguments.shell"
+					"0": {
+						name: "punctuation.definition.group.shell punctuation.section.function.definition.shell"
 					}
 				},
-				end: ";|&|$",
 				endCaptures: {
 					"0": {
-						name: "punctuation.definition.function.shell"
+						name: "punctuation.definition.group.shell punctuation.section.function.definition.shell"
 					}
 				},
-				name: "meta.function.shell",
+				name: "meta.function.body.shell",
 				patterns: [
 					{
 						include: "#initial_context"
@@ -475,35 +554,33 @@ var repository = {
 				]
 			},
 			{
-				begin: "(?:^\\s*|(?<=^|;|&|\\s))([^\\s\\\\=]+)\\s*(\\(\\))",
+				begin: "\\(",
+				end: "\\)",
 				beginCaptures: {
-					"1": {
-						name: "entity.name.function.shell"
-					},
-					"2": {
-						name: "punctuation.definition.arguments.shell"
+					"0": {
+						name: "punctuation.definition.group.shell punctuation.section.function.definition.shell"
 					}
 				},
-				end: ";|&|$",
 				endCaptures: {
 					"0": {
-						name: "punctuation.definition.function.shell"
+						name: "punctuation.definition.group.shell punctuation.section.function.definition.shell"
 					}
 				},
-				name: "meta.function.shell",
+				name: "meta.function.body.shell",
 				patterns: [
 					{
 						include: "#initial_context"
 					}
 				]
 			}
-		]
+		],
+		applyEndPatternLast: 1
 	},
 	heredoc: {
 		patterns: [
 			{
-				begin: "(<<-)\\s*+(\"|')\\s*+((?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w))(?=\\s|;|&|<|\"|')\\2",
-				end: "^\\t*\\3(?=\\s|;|&|$)",
+				begin: "((?<!<)<<-)[ \\t]*+(\"|')[ \\t]*+((?<!\\w)[a-zA-Z_0-9-]+(?!\\w))(?=\\s|;|&|<|\"|')(?:\\2)(.*)",
+				end: "^\\t*(?:\\3)(?=\\s|;|&|$)",
 				beginCaptures: {
 					"1": {
 						name: "keyword.operator.heredoc.shell"
@@ -512,6 +589,13 @@ var repository = {
 					},
 					"3": {
 						name: "punctuation.definition.string.heredoc.shell"
+					},
+					"4": {
+						patterns: [
+							{
+								include: "#normal_statement_context"
+							}
+						]
 					}
 				},
 				endCaptures: {
@@ -519,13 +603,13 @@ var repository = {
 						name: "punctuation.definition.string.heredoc.shell"
 					}
 				},
-				name: "string.quoted.heredoc.indent.shell",
+				contentName: "string.quoted.heredoc.indent",
 				patterns: [
 				]
 			},
 			{
-				begin: "(<<)\\s*+(\"|')\\s*+((?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w))(?=\\s|;|&|<|\"|')\\2",
-				end: "^\\3(?=\\s|;|&|$)",
+				begin: "((?<!<)<<(?!<))[ \\t]*+(\"|')[ \\t]*+((?<!\\w)[a-zA-Z_0-9-]+(?!\\w))(?=\\s|;|&|<|\"|')(?:\\2)(.*)",
+				end: "^(?:\\3)(?=\\s|;|&|$)",
 				beginCaptures: {
 					"1": {
 						name: "keyword.operator.heredoc.shell"
@@ -534,6 +618,13 @@ var repository = {
 					},
 					"3": {
 						name: "punctuation.definition.string.heredoc.shell"
+					},
+					"4": {
+						patterns: [
+							{
+								include: "#normal_statement_context"
+							}
+						]
 					}
 				},
 				endCaptures: {
@@ -541,19 +632,26 @@ var repository = {
 						name: "punctuation.definition.string.heredoc.shell"
 					}
 				},
-				name: "string.quoted.heredoc.no-indent.shell",
+				contentName: "string.quoted.heredoc.no-indent",
 				patterns: [
 				]
 			},
 			{
-				begin: "(<<-)\\s*+((?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w))(?=\\s|;|&|<|\"|')",
-				end: "^\\t*\\2(?=\\s|;|&|$)",
+				begin: "((?<!<)<<-)[ \\t]*+((?<!\\w)[a-zA-Z_0-9-]+(?!\\w))(?=\\s|;|&|<|\"|')(.*)",
+				end: "^\\t*(?:\\2)(?=\\s|;|&|$)",
 				beginCaptures: {
 					"1": {
 						name: "keyword.operator.heredoc.shell"
 					},
 					"2": {
 						name: "punctuation.definition.string.heredoc.shell"
+					},
+					"3": {
+						patterns: [
+							{
+								include: "#normal_statement_context"
+							}
+						]
 					}
 				},
 				endCaptures: {
@@ -561,7 +659,7 @@ var repository = {
 						name: "punctuation.definition.string.heredoc.shell"
 					}
 				},
-				name: "string.unquoted.heredoc.indent.shell",
+				contentName: "string.unquoted.heredoc.indent",
 				patterns: [
 					{
 						include: "#double_quote_escape_char"
@@ -575,14 +673,21 @@ var repository = {
 				]
 			},
 			{
-				begin: "(<<)\\s*+((?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w))(?=\\s|;|&|<|\"|')",
-				end: "^\\2(?=\\s|;|&|$)",
+				begin: "((?<!<)<<(?!<))[ \\t]*+((?<!\\w)[a-zA-Z_0-9-]+(?!\\w))(?=\\s|;|&|<|\"|')(.*)",
+				end: "^(?:\\2)(?=\\s|;|&|$)",
 				beginCaptures: {
 					"1": {
 						name: "keyword.operator.heredoc.shell"
 					},
 					"2": {
 						name: "punctuation.definition.string.heredoc.shell"
+					},
+					"3": {
+						patterns: [
+							{
+								include: "#normal_statement_context"
+							}
+						]
 					}
 				},
 				endCaptures: {
@@ -590,7 +695,7 @@ var repository = {
 						name: "punctuation.definition.string.heredoc.shell"
 					}
 				},
-				name: "string.unquoted.heredoc.no-indent.shell",
+				contentName: "string.unquoted.heredoc.no-indent",
 				patterns: [
 					{
 						include: "#double_quote_escape_char"
@@ -655,7 +760,12 @@ var repository = {
 					}
 				},
 				name: "meta.herestring.shell",
-				contentName: "string.quoted.double.shell"
+				contentName: "string.quoted.double.shell",
+				patterns: [
+					{
+						include: "#double_quote_context"
+					}
+				]
 			},
 			{
 				captures: {
@@ -681,17 +791,11 @@ var repository = {
 			{
 				include: "#comment"
 			},
-			{
-				include: "#boolean"
-			},
-			{
-				include: "#numeric_literal"
-			},
 			{
 				include: "#pipeline"
 			},
 			{
-				include: "#statement_seperator"
+				include: "#normal_statement_seperator"
 			},
 			{
 				include: "#logical_expression_double"
@@ -706,10 +810,7 @@ var repository = {
 				include: "#loop"
 			},
 			{
-				include: "#string"
-			},
-			{
-				include: "#function-definition"
+				include: "#function_definition"
 			},
 			{
 				include: "#variable"
@@ -736,10 +837,10 @@ var repository = {
 				include: "#alias_statement"
 			},
 			{
-				include: "#assignment"
+				include: "#normal_statement"
 			},
 			{
-				include: "#command_call"
+				include: "#string"
 			},
 			{
 				include: "#support"
@@ -861,12 +962,8 @@ var repository = {
 	keyword: {
 		patterns: [
 			{
-				match: "(?<=^|;|&|\\s)(?:then|else|elif|fi|for|in|do|done|select|case|continue|esac|while|until|return)(?=\\s|;|&|$)",
+				match: "(?<=^|;|&| |\\t)(?:then|else|elif|fi|for|in|do|done|select|case|continue|esac|while|until|return)(?= |\\t|;|&|$)",
 				name: "keyword.control.$0.shell"
-			},
-			{
-				match: "(?<=^|;|&|\\s)(?:export|declare|typeset|local|readonly)(?=\\s|;|&|$)",
-				name: "storage.modifier.$0.shell"
 			}
 		]
 	},
@@ -924,6 +1021,9 @@ var repository = {
 			{
 				include: "#boolean"
 			},
+			{
+				include: "#redirect_number"
+			},
 			{
 				include: "#numeric_literal"
 			},
@@ -931,7 +1031,7 @@ var repository = {
 				include: "#pipeline"
 			},
 			{
-				include: "#statement_seperator"
+				include: "#normal_statement_seperator"
 			},
 			{
 				include: "#string"
@@ -975,55 +1075,7 @@ var repository = {
 		name: "meta.scope.logical-expression.shell",
 		patterns: [
 			{
-				include: "#regex_comparison"
-			},
-			{
-				include: "#logical-expression"
-			},
-			{
-				include: "#logical_expression_single"
-			},
-			{
-				include: "#logical_expression_double"
-			},
-			{
-				include: "#comment"
-			},
-			{
-				include: "#boolean"
-			},
-			{
-				include: "#numeric_literal"
-			},
-			{
-				include: "#pipeline"
-			},
-			{
-				include: "#statement_seperator"
-			},
-			{
-				include: "#string"
-			},
-			{
-				include: "#variable"
-			},
-			{
-				include: "#interpolation"
-			},
-			{
-				include: "#heredoc"
-			},
-			{
-				include: "#herestring"
-			},
-			{
-				include: "#pathname"
-			},
-			{
-				include: "#keyword"
-			},
-			{
-				include: "#support"
+				include: "#logical_expression_context"
 			}
 		]
 	},
@@ -1043,55 +1095,7 @@ var repository = {
 		name: "meta.scope.logical-expression.shell",
 		patterns: [
 			{
-				include: "#regex_comparison"
-			},
-			{
-				include: "#logical-expression"
-			},
-			{
-				include: "#logical_expression_single"
-			},
-			{
-				include: "#logical_expression_double"
-			},
-			{
-				include: "#comment"
-			},
-			{
-				include: "#boolean"
-			},
-			{
-				include: "#numeric_literal"
-			},
-			{
-				include: "#pipeline"
-			},
-			{
-				include: "#statement_seperator"
-			},
-			{
-				include: "#string"
-			},
-			{
-				include: "#variable"
-			},
-			{
-				include: "#interpolation"
-			},
-			{
-				include: "#heredoc"
-			},
-			{
-				include: "#herestring"
-			},
-			{
-				include: "#pathname"
-			},
-			{
-				include: "#keyword"
-			},
-			{
-				include: "#support"
+				include: "#logical_expression_context"
 			}
 		]
 	},
@@ -1327,10 +1331,10 @@ var repository = {
 				]
 			},
 			{
-				begin: "{",
+				begin: "(?<![^ \\t])({)",
 				end: "}",
 				beginCaptures: {
-					"0": {
+					"1": {
 						name: "punctuation.definition.group.shell"
 					}
 				},
@@ -1348,262 +1352,214 @@ var repository = {
 			}
 		]
 	},
-	numeric_literal: {
-		match: "(?<!\\w)((?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])*)(?!\\w)",
-		captures: {
-			"1": {
+	modifiers: {
+		match: "(?<=^|;|&|[ \\t])(?:export|declare|typeset|local|readonly)(?=[ \\t]|;|&|$)",
+		name: "storage.modifier.$0.shell"
+	},
+	normal_statement: {
+		begin: "(?!^[ \\t]*+$)(?:(?<=^if | if |\\tif |^elif | elif |\\telif |^then | then |\\tthen |^else | else |\\telse |^while | while |\\twhile |^do | do |\\tdo )|(?<=(?:^|;|\\||&|!|\\(|\\{|\\`)))[ \\t]*+(?!nocorrect\\W|nocorrect\\$|function\\W|function\\$|foreach\\W|foreach\\$|repeat\\W|repeat\\$|logout\\W|logout\\$|coproc\\W|coproc\\$|select\\W|select\\$|while\\W|while\\$|pushd\\W|pushd\\$|until\\W|until\\$|case\\W|case\\$|done\\W|done\\$|elif\\W|elif\\$|else\\W|else\\$|esac\\W|esac\\$|popd\\W|popd\\$|then\\W|then\\$|time\\W|time\\$|for\\W|for\\$|end\\W|end\\$|fi\\W|fi\\$|do\\W|do\\$|in\\W|in\\$|if\\W|if\\$)",
+		end: "(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|[ \\t]*#|\\])(?<!\\\\)",
+		beginCaptures: {
+		},
+		endCaptures: {
+		},
+		name: "meta.statement.shell",
+		patterns: [
+			{
+				include: "#function_definition"
+			},
+			{
+				include: "#assignment"
+			},
+			{
+				begin: "[ \\t]*+(?!(?:!|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|[ \\t]))(?!foreach\\b(?!\\/)|select\\b(?!\\/)|repeat\\b(?!\\/)|until\\b(?!\\/)|while\\b(?!\\/)|case\\b(?!\\/)|done\\b(?!\\/)|elif\\b(?!\\/)|else\\b(?!\\/)|esac\\b(?!\\/)|then\\b(?!\\/)|for\\b(?!\\/)|end\\b(?!\\/)|in\\b(?!\\/)|fi\\b(?!\\/)|do\\b(?!\\/)|if\\b(?!\\/))(?!\\\\\\n?$)",
+				end: "(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|[ \\t]*#|\\])(?<!\\\\)",
+				beginCaptures: {
+				},
+				endCaptures: {
+				},
+				name: "meta.statement.command.shell",
 				patterns: [
 					{
-						begin: "(?=.)",
-						end: "$",
+						begin: "\\G",
+						end: "(?= |\\t|;|\\||&|$|\\n|\\)|\\`)",
 						beginCaptures: {
 						},
 						endCaptures: {
 						},
+						name: "meta.statement.command.name.shell",
 						patterns: [
 							{
-								match: "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?(?:(?<!')([pP])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?([lLfF](?!\\w))?$",
-								captures: {
-									"1": {
-										name: "keyword.other.unit.hexadecimal.shell"
-									},
-									"2": {
-										name: "constant.numeric.hexadecimal.shell",
-										patterns: [
-											{
-												match: "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-												name: "punctuation.separator.constant.numeric.shell"
-											}
-										]
-									},
-									"3": {
-										name: "punctuation.separator.constant.numeric.shell"
-									},
-									"4": {
-										name: "constant.numeric.hexadecimal.shell"
-									},
-									"5": {
-										name: "constant.numeric.hexadecimal.shell",
-										patterns: [
-											{
-												match: "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-												name: "punctuation.separator.constant.numeric.shell"
-											}
-										]
-									},
-									"6": {
-										name: "punctuation.separator.constant.numeric.shell"
-									},
-									"7": {
-										name: "keyword.other.unit.exponent.hexadecimal.shell"
-									},
-									"8": {
-										name: "keyword.operator.plus.exponent.hexadecimal.shell"
-									},
-									"9": {
-										name: "keyword.operator.minus.exponent.hexadecimal.shell"
-									},
-									"10": {
-										name: "constant.numeric.exponent.hexadecimal.shell",
-										patterns: [
-											{
-												match: "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-												name: "punctuation.separator.constant.numeric.shell"
-											}
-										]
-									},
-									"11": {
-										name: "keyword.other.unit.suffix.floating-point.shell"
-									}
-								}
+								include: "#modifiers"
 							},
 							{
-								match: "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?(?:(?<!')([eE])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?([lLfF](?!\\w))?$",
-								captures: {
-									"1": {
-										name: "constant.numeric.decimal.shell",
-										patterns: [
-											{
-												match: "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-												name: "punctuation.separator.constant.numeric.shell"
-											}
-										]
-									},
-									"2": {
-										name: "punctuation.separator.constant.numeric.shell"
-									},
-									"3": {
-										name: "constant.numeric.decimal.point.shell"
-									},
-									"4": {
-										name: "constant.numeric.decimal.shell",
-										patterns: [
-											{
-												match: "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-												name: "punctuation.separator.constant.numeric.shell"
-											}
-										]
-									},
-									"5": {
-										name: "punctuation.separator.constant.numeric.shell"
-									},
-									"6": {
-										name: "keyword.other.unit.exponent.decimal.shell"
-									},
-									"7": {
-										name: "keyword.operator.plus.exponent.decimal.shell"
-									},
-									"8": {
-										name: "keyword.operator.minus.exponent.decimal.shell"
-									},
-									"9": {
-										name: "constant.numeric.exponent.decimal.shell",
-										patterns: [
-											{
-												match: "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-												name: "punctuation.separator.constant.numeric.shell"
-											}
-										]
-									},
-									"10": {
-										name: "keyword.other.unit.suffix.floating-point.shell"
-									}
-								}
+								match: "(?<!\\w)(?:return|break)(?!\\w)",
+								name: "entity.name.function.call.shell entity.name.command.shell keyword.control.$0.shell"
 							},
 							{
-								match: "(\\G0[bB])([01](?:[01]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?$",
-								captures: {
-									"1": {
-										name: "keyword.other.unit.binary.shell"
-									},
-									"2": {
-										name: "constant.numeric.binary.shell",
-										patterns: [
-											{
-												match: "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-												name: "punctuation.separator.constant.numeric.shell"
-											}
-										]
-									},
-									"3": {
-										name: "punctuation.separator.constant.numeric.shell"
-									},
-									"4": {
-										name: "keyword.other.unit.suffix.integer.shell"
-									}
-								}
+								match: "(?<!\\w)(?:unfunction|unsetopt|autoload|suspend|bindkey|builtin|getopts|command|declare|unalias|history|unlimit|typeset|source|printf|unhash|disown|ulimit|return|which|alias|break|false|print|shift|times|umask|umask|unset|read|type|exec|eval|wait|echo|dirs|jobs|kill|hash|stat|exit|test|trap|true|let|set|pwd|cd|fg|bg|fc|:|\\.)(?!\\/)(?!\\w)",
+								name: "entity.name.function.call.shell entity.name.command.shell support.function.builtin.shell"
 							},
 							{
-								match: "(\\G0)((?:[0-7]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))+)((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?$",
-								captures: {
-									"1": {
-										name: "keyword.other.unit.octal.shell"
-									},
-									"2": {
-										name: "constant.numeric.octal.shell",
-										patterns: [
-											{
-												match: "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-												name: "punctuation.separator.constant.numeric.shell"
-											}
-										]
-									},
-									"3": {
-										name: "punctuation.separator.constant.numeric.shell"
-									},
-									"4": {
-										name: "keyword.other.unit.suffix.integer.shell"
-									}
-								}
+								include: "#variable"
 							},
 							{
-								match: "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)(?:(?<!')([pP])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?$",
+								match: "(?<=\\G|'|\"|\\}|\\))([^ \\n\\t\\r\"'=;&\\|`\\)\\{]+)",
 								captures: {
 									"1": {
-										name: "keyword.other.unit.hexadecimal.shell"
-									},
-									"2": {
-										name: "constant.numeric.hexadecimal.shell",
-										patterns: [
-											{
-												match: "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-												name: "punctuation.separator.constant.numeric.shell"
-											}
-										]
-									},
-									"3": {
-										name: "punctuation.separator.constant.numeric.shell"
-									},
-									"4": {
-										name: "keyword.other.unit.exponent.hexadecimal.shell"
-									},
-									"5": {
-										name: "keyword.operator.plus.exponent.hexadecimal.shell"
-									},
-									"6": {
-										name: "keyword.operator.minus.exponent.hexadecimal.shell"
-									},
-									"7": {
-										name: "constant.numeric.exponent.hexadecimal.shell",
-										patterns: [
-											{
-												match: "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-												name: "punctuation.separator.constant.numeric.shell"
-											}
-										]
-									},
-									"8": {
-										name: "keyword.other.unit.suffix.integer.shell"
+										name: "entity.name.function.call.shell entity.name.command.shell"
 									}
 								}
 							},
 							{
-								match: "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)(?:(?<!')([eE])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?$",
-								captures: {
+								begin: "(?:\\G|(?<! |\\t|;|\\||&|\\n|\\{|#))((?:\\$)?)((?:(\")|(')))",
+								end: "(?<!\\G)(?<=(?:\\2))",
+								beginCaptures: {
 									"1": {
-										name: "constant.numeric.decimal.shell",
-										patterns: [
-											{
-												match: "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-												name: "punctuation.separator.constant.numeric.shell"
-											}
-										]
+										name: "meta.statement.command.name.quoted.shell punctuation.definition.string.shell entity.name.function.call.shell entity.name.command.shell"
 									},
 									"2": {
-										name: "punctuation.separator.constant.numeric.shell"
 									},
 									"3": {
-										name: "keyword.other.unit.exponent.decimal.shell"
+										name: "meta.statement.command.name.quoted.shell string.quoted.double.shell punctuation.definition.string.begin.shell entity.name.function.call.shell entity.name.command.shell"
 									},
 									"4": {
-										name: "keyword.operator.plus.exponent.decimal.shell"
-									},
-									"5": {
-										name: "keyword.operator.minus.exponent.decimal.shell"
-									},
-									"6": {
-										name: "constant.numeric.exponent.decimal.shell",
-										patterns: [
-											{
-												match: "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-												name: "punctuation.separator.constant.numeric.shell"
-											}
-										]
+										name: "meta.statement.command.name.quoted.shell string.quoted.single.shell punctuation.definition.string.begin.shell entity.name.function.call.shell entity.name.command.shell"
+									}
+								},
+								endCaptures: {
+								},
+								patterns: [
+									{
+										include: "#continuation_of_single_quoted_command_name"
 									},
-									"7": {
-										name: "keyword.other.unit.suffix.integer.shell"
+									{
+										include: "#continuation_of_double_quoted_command_name"
 									}
-								}
+								]
+							},
+							{
+								include: "#line_continuation"
 							}
 						]
+					},
+					{
+						include: "#line_continuation"
+					},
+					{
+						include: "#option"
+					},
+					{
+						include: "#argument"
+					},
+					{
+						include: "#statement_context"
+					},
+					{
+						include: "#string"
 					}
 				]
+			},
+			{
+				include: "#line_continuation"
+			},
+			{
+				include: "#normal_statement_context"
+			}
+		]
+	},
+	normal_statement_context: {
+		patterns: [
+			{
+				include: "#comment"
+			},
+			{
+				include: "#pipeline"
+			},
+			{
+				include: "#normal_statement_seperator"
+			},
+			{
+				include: "#misc_ranges"
+			},
+			{
+				include: "#boolean"
+			},
+			{
+				include: "#redirect_number"
+			},
+			{
+				include: "#numeric_literal"
+			},
+			{
+				include: "#string"
+			},
+			{
+				include: "#variable"
+			},
+			{
+				include: "#interpolation"
+			},
+			{
+				include: "#heredoc"
+			},
+			{
+				include: "#herestring"
+			},
+			{
+				include: "#redirection"
+			},
+			{
+				include: "#pathname"
+			},
+			{
+				include: "#keyword"
+			},
+			{
+				include: "#support"
+			}
+		]
+	},
+	normal_statement_seperator: {
+		match: "(?:(?:(?:(?:(;)|(&&))|(\\|\\|))|(&))|\\n)",
+		captures: {
+			"1": {
+				name: "punctuation.terminator.statement.semicolon.shell"
+			},
+			"2": {
+				name: "punctuation.separator.statement.and.shell"
+			},
+			"3": {
+				name: "punctuation.separator.statement.or.shell"
+			},
+			"4": {
+				name: "punctuation.separator.statement.background.shell"
+			}
+		}
+	},
+	numeric_literal: {
+		match: "[ \\t]*+(?<==| |\\t|^|\\{|\\(|\\[)(?:(?:(?:(?:(0[xX][0-9A-Fa-f]+)|(0\\d+))|(\\d{1,2}#[0-9a-zA-Z@_]+))|(-?\\d+\\.\\d+))|(-?\\d+))(?!>)",
+		captures: {
+			"1": {
+				name: "constant.numeric.shell constant.numeric.hex.shell"
+			},
+			"2": {
+				name: "constant.numeric.shell constant.numeric.octal.shell"
+			},
+			"3": {
+				name: "constant.numeric.shell constant.numeric.other.shell"
+			},
+			"4": {
+				name: "constant.numeric.shell constant.numeric.integer.shell"
+			},
+			"5": {
+				name: "constant.numeric.shell constant.numeric.integer.shell"
 			}
 		}
 	},
 	option: {
-		begin: "\\s++(-)((?!(?:!|%|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|\\s)))",
-		end: "(?:(?=\\s)|(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|#|\\])(?<!\\\\))",
+		begin: "[ \\t]++(-)((?!(?:!|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|[ \\t])))",
+		end: "(?:(?=[ \\t])|(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|[ \\t]*#|\\])(?<!\\\\))",
 		beginCaptures: {
 			"1": {
 				name: "string.unquoted.argument.shell constant.other.option.dash.shell"
@@ -1702,6 +1658,20 @@ var repository = {
 			}
 		]
 	},
+	redirect_number: {
+		match: "(?<=[ \\t])(?:(1)|(2)|(\\d+))(?=>)",
+		captures: {
+			"1": {
+				name: "keyword.operator.redirect.stdout.shell"
+			},
+			"2": {
+				name: "keyword.operator.redirect.stderr.shell"
+			},
+			"3": {
+				name: "keyword.operator.redirect.$3.shell"
+			}
+		}
+	},
 	redirection: {
 		patterns: [
 			{
@@ -1742,12 +1712,12 @@ var repository = {
 		]
 	},
 	simple_options: {
-		match: "(?:\\s++\\-\\w+)*",
+		match: "(?:[ \\t]++\\-\\w+)*",
 		captures: {
 			"0": {
 				patterns: [
 					{
-						match: "\\s++(\\-)(\\w+)",
+						match: "[ \\t]++(\\-)(\\w+)",
 						captures: {
 							"1": {
 								name: "string.unquoted.argument.shell constant.other.option.dash.shell"
@@ -1761,65 +1731,66 @@ var repository = {
 			}
 		}
 	},
-	statement_context: {
-		patterns: [
-			{
-				include: "#comment"
-			},
-			{
-				include: "#pipeline"
-			},
-			{
-				include: "#statement_seperator"
-			},
-			{
-				include: "#misc_ranges"
-			},
-			{
-				include: "#string"
-			},
-			{
-				include: "#variable"
-			},
-			{
-				include: "#interpolation"
-			},
-			{
-				include: "#heredoc"
-			},
-			{
-				include: "#herestring"
-			},
-			{
-				include: "#redirection"
-			},
-			{
-				include: "#pathname"
-			},
-			{
-				include: "#keyword"
-			},
-			{
-				include: "#support"
+	start_of_command: {
+		match: "[ \\t]*+(?!(?:!|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|[ \\t]))(?!foreach\\b(?!\\/)|select\\b(?!\\/)|repeat\\b(?!\\/)|until\\b(?!\\/)|while\\b(?!\\/)|case\\b(?!\\/)|done\\b(?!\\/)|elif\\b(?!\\/)|else\\b(?!\\/)|esac\\b(?!\\/)|then\\b(?!\\/)|for\\b(?!\\/)|end\\b(?!\\/)|in\\b(?!\\/)|fi\\b(?!\\/)|do\\b(?!\\/)|if\\b(?!\\/))(?!\\\\\\n?$)"
+	},
+	start_of_double_quoted_command_name: {
+		match: "(?!(?:!|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|[ \\t]))(?:[ \\t]*+([^ \t\n'&;<>\\(\\)\\$`\\\\\"\\|]+(?!>)))?(?:(?:\\$\")|\")",
+		captures: {
+			"1": {
+				name: "entity.name.function.call.shell entity.name.command.shell",
+				patterns: [
+					{
+						match: "\\*",
+						name: "variable.language.special.wildcard.shell"
+					},
+					{
+						include: "#variable"
+					},
+					{
+						include: "#numeric_literal"
+					},
+					{
+						match: "(?<!\\w)(\\b(?:true|false)\\b)(?!\\w)",
+						captures: {
+							"1": {
+								name: "constant.language.$1.shell"
+							}
+						}
+					}
+				]
 			}
-		]
+		},
+		name: "meta.statement.command.name.quoted.shell string.quoted.double.shell punctuation.definition.string.begin.shell entity.name.function.call.shell entity.name.command.shell"
 	},
-	statement_seperator: {
-		match: "(?:(?:(?:(?:(;)|(&&))|(\\|\\|))|(&))|\\n)",
+	start_of_single_quoted_command_name: {
+		match: "(?!(?:!|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|[ \\t]))(?:[ \\t]*+([^ \t\n'&;<>\\(\\)\\$`\\\\\"\\|]+(?!>)))?(?:(?:\\$')|')",
 		captures: {
 			"1": {
-				name: "punctuation.terminator.statement.semicolon.shell"
-			},
-			"2": {
-				name: "punctuation.separator.statement.and.shell"
-			},
-			"3": {
-				name: "punctuation.separator.statement.or.shell"
-			},
-			"4": {
-				name: "punctuation.separator.statement.background.shell"
+				name: "entity.name.function.call.shell entity.name.command.shell",
+				patterns: [
+					{
+						match: "\\*",
+						name: "variable.language.special.wildcard.shell"
+					},
+					{
+						include: "#variable"
+					},
+					{
+						include: "#numeric_literal"
+					},
+					{
+						match: "(?<!\\w)(\\b(?:true|false)\\b)(?!\\w)",
+						captures: {
+							"1": {
+								name: "constant.language.$1.shell"
+							}
+						}
+					}
+				]
 			}
-		}
+		},
+		name: "meta.statement.command.name.quoted.shell string.quoted.single.shell punctuation.definition.string.begin.shell entity.name.function.call.shell entity.name.command.shell"
 	},
 	string: {
 		patterns: [
@@ -1829,12 +1800,12 @@ var repository = {
 			},
 			{
 				begin: "'",
+				end: "'",
 				beginCaptures: {
 					"0": {
 						name: "punctuation.definition.string.begin.shell"
 					}
 				},
-				end: "'",
 				endCaptures: {
 					"0": {
 						name: "punctuation.definition.string.end.shell"
@@ -1843,13 +1814,13 @@ var repository = {
 				name: "string.quoted.single.shell"
 			},
 			{
-				begin: " *\\$?\"",
+				begin: "\\$?\"",
+				end: "\"",
 				beginCaptures: {
 					"0": {
 						name: "punctuation.definition.string.begin.shell"
 					}
 				},
-				end: "\"",
 				endCaptures: {
 					"0": {
 						name: "punctuation.definition.string.end.shell"
@@ -1858,7 +1829,7 @@ var repository = {
 				name: "string.quoted.double.shell",
 				patterns: [
 					{
-						match: "\\\\[\\$`\"\\\\\\n]",
+						match: "\\\\[\\$\\n`\"\\\\]",
 						name: "constant.character.escape.shell"
 					},
 					{
@@ -1871,12 +1842,12 @@ var repository = {
 			},
 			{
 				begin: "\\$'",
+				end: "'",
 				beginCaptures: {
 					"0": {
 						name: "punctuation.definition.string.begin.shell"
 					}
 				},
-				end: "'",
 				endCaptures: {
 					"0": {
 						name: "punctuation.definition.string.end.shell"
@@ -1885,25 +1856,33 @@ var repository = {
 				name: "string.quoted.single.dollar.shell",
 				patterns: [
 					{
-						match: "\\\\(a|b|e|f|n|r|t|v|\\\\|')",
+						match: "\\\\(?:a|b|e|f|n|r|t|v|\\\\|')",
 						name: "constant.character.escape.ansi-c.shell"
 					},
 					{
-						match: "\\\\[0-9]{3}",
+						match: "\\\\[0-9]{3}\"",
 						name: "constant.character.escape.octal.shell"
 					},
 					{
-						match: "\\\\x[0-9a-fA-F]{2}",
+						match: "\\\\x[0-9a-fA-F]{2}\"",
 						name: "constant.character.escape.hex.shell"
 					},
 					{
-						match: "\\\\c.",
+						match: "\\\\c.\"",
 						name: "constant.character.escape.control-char.shell"
 					}
 				]
 			}
 		]
 	},
+	support: {
+		patterns: [
+			{
+				match: "(?<=^|;|&|\\s)(?::|\\.)(?=\\s|;|&|$)",
+				name: "support.function.builtin.shell"
+			}
+		]
+	},
 	variable: {
 		patterns: [
 			{
@@ -1929,43 +1908,82 @@ var repository = {
 				}
 			},
 			{
-				match: "(\\$)(\\{[0-9]+\\}(?!\\w))",
+				match: "(\\$)([-*#?$!0_](?!\\w))",
 				captures: {
 					"1": {
-						name: "punctuation.definition.variable.shell variable.parameter.positional.shell"
+						name: "punctuation.definition.variable.shell variable.language.special.shell"
 					},
 					"2": {
-						name: "variable.parameter.positional.shell"
+						name: "variable.language.special.shell"
 					}
 				}
 			},
 			{
-				match: "(\\$)([-*#?$!0_](?!\\w))",
-				captures: {
+				begin: "(\\$)(\\{)[ \\t]*+(?=\\d)",
+				end: "\\}",
+				beginCaptures: {
 					"1": {
-						name: "punctuation.definition.variable.shell variable.language.special.shell"
+						name: "punctuation.definition.variable.shell variable.parameter.positional.shell"
 					},
 					"2": {
-						name: "variable.language.special.shell"
+						name: "punctuation.section.bracket.curly.variable.begin.shell punctuation.definition.variable.shell variable.parameter.positional.shell"
 					}
-				}
+				},
+				endCaptures: {
+					"0": {
+						name: "punctuation.section.bracket.curly.variable.end.shell punctuation.definition.variable.shell variable.parameter.positional.shell"
+					}
+				},
+				contentName: "meta.parameter-expansion",
+				patterns: [
+					{
+						match: "!|:[-=?]?|\\*|@|##|#|%%|%|\\/",
+						name: "keyword.operator.expansion.shell"
+					},
+					{
+						match: "(\\[)[^\\]]+(\\])",
+						captures: {
+							"1": {
+								name: "punctuation.section.array.shell"
+							},
+							"2": {
+								name: "punctuation.section.array.shell"
+							}
+						}
+					},
+					{
+						match: "[0-9]+",
+						name: "variable.parameter.positional.shell"
+					},
+					{
+						match: "(?<!\\w)[a-zA-Z_0-9-]+(?!\\w)",
+						name: "variable.other.normal.shell"
+					},
+					{
+						include: "#variable"
+					},
+					{
+						include: "#string"
+					}
+				]
 			},
 			{
 				begin: "(\\$)(\\{)",
 				end: "\\}",
 				beginCaptures: {
 					"1": {
-						name: "punctuation.definition.variable.shell punctuation.section.bracket.curly.variable.begin.shell"
+						name: "punctuation.definition.variable.shell"
 					},
 					"2": {
-						name: "punctuation.section.bracket.curly.variable.begin.shell"
+						name: "punctuation.section.bracket.curly.variable.begin.shell punctuation.definition.variable.shell"
 					}
 				},
 				endCaptures: {
 					"0": {
-						name: "punctuation.section.bracket.curly.variable.end.shell"
+						name: "punctuation.section.bracket.curly.variable.end.shell punctuation.definition.variable.shell"
 					}
 				},
+				contentName: "meta.parameter-expansion",
 				patterns: [
 					{
 						match: "!|:[-=?]?|\\*|@|##|#|%%|%|\\/",
@@ -1982,6 +2000,10 @@ var repository = {
 							}
 						}
 					},
+					{
+						match: "(?<!\\w)[a-zA-Z_0-9-]+(?!\\w)",
+						name: "variable.other.normal.shell"
+					},
 					{
 						include: "#variable"
 					},