@codingame/monaco-editor-wrapper 3.5.3 → 3.6.0

package/dist/shell-unix-bash.tmLanguage.js

@@ -3,57 +3,183 @@ var information_for_contributors = [
 	"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 	"Once accepted there, we are happy to receive an update request."
 ];
-var version = "https://github.com/atom/language-shellscript/commit/4f8d7bb5cc4d1643674551683df10fe552dd5a6f";
+var version = "https://github.com/jeff-hykin/better-shell-syntax/commit/b05618771b35b4baa25661dff91170b4924fdac8";
 var name = "Shell Script";
 var scopeName = "source.shell";
 var patterns = [
 	{
-		include: "#comment"
-	},
-	{
-		include: "#pipeline"
-	},
-	{
-		include: "#list"
-	},
-	{
-		include: "#compound-command"
-	},
-	{
-		include: "#loop"
-	},
-	{
-		include: "#string"
-	},
-	{
-		include: "#function-definition"
-	},
-	{
-		include: "#variable"
-	},
-	{
-		include: "#interpolation"
+		include: "#initial_context"
+	}
+];
+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)|(?= |$))",
+		beginCaptures: {
+			"1": {
+				name: "storage.type.alias.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: "#statement_context"
+			}
+		]
 	},
-	{
-		include: "#heredoc"
+	argument: {
+		begin: "\\s++(?!(?:%|&|\\||\\(|\\[|#|\\n|$|;))",
+		end: "(?=\\s|;|\\||&|$|\\n|\\)|\\`)",
+		beginCaptures: {
+		},
+		endCaptures: {
+		},
+		name: "meta.argument.shell",
+		patterns: [
+			{
+				include: "#argument_context"
+			},
+			{
+				include: "#line_continuation"
+			}
+		]
 	},
-	{
-		include: "#herestring"
+	argument_context: {
+		patterns: [
+			{
+				match: "[^ \n'&;<>\\(\\)\\$`\\\\\"\\|]+(?!>)",
+				captures: {
+					"0": {
+						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: "string.unquoted.argument.shell"
+			},
+			{
+				include: "#statement_context"
+			}
+		]
 	},
-	{
-		include: "#redirection"
+	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"
+			},
+			"7": {
+				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: "#argument_context"
+			}
+		]
 	},
-	{
-		include: "#pathname"
+	block_comment: {
+		begin: "\\s*+(\\/\\*)",
+		end: "\\*\\/",
+		beginCaptures: {
+			"1": {
+				name: "punctuation.definition.comment.begin.shell"
+			}
+		},
+		endCaptures: {
+			"0": {
+				name: "punctuation.definition.comment.end.shell"
+			}
+		},
+		name: "comment.block.shell"
 	},
-	{
-		include: "#keyword"
+	boolean: {
+		match: "\\b(?:true|false)\\b",
+		name: "constant.language.$0.shell"
 	},
-	{
-		include: "#support"
-	}
-];
-var repository = {
 	"case-clause": {
 		patterns: [
 			{
@@ -105,7 +231,7 @@ var repository = {
 						name: "meta.scope.case-clause-body.shell",
 						patterns: [
 							{
-								include: "$self"
+								include: "#initial_context"
 							}
 						]
 					}
@@ -113,34 +239,111 @@ var repository = {
 			}
 		]
 	},
-	comment: {
-		begin: "(^\\s+)?(?<=^|\\W)(?<!-)(?=#)(?!#{)",
+	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: {
-			"1": {
-				name: "punctuation.whitespace.comment.leading.shell"
-			}
 		},
-		end: "(?!\\G)",
+		endCaptures: {
+		},
+		name: "meta.statement.shell",
 		patterns: [
 			{
-				begin: "#!",
+				begin: "\\s*+(?!(?:!|%|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|\\s))(.+?)(?:(?=\\s)|(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|#|\\])(?<!\\\\))",
+				end: "(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|#|\\])(?<!\\\\)",
 				beginCaptures: {
 					"0": {
-						name: "punctuation.definition.comment.shebang.shell"
+						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"
+							}
+						]
 					}
 				},
-				end: "$",
-				name: "comment.line.number-sign.shebang.shell"
+				endCaptures: {
+				},
+				name: "meta.command.shell",
+				patterns: [
+					{
+						include: "#line_continuation"
+					},
+					{
+						include: "#option"
+					},
+					{
+						include: "#argument"
+					},
+					{
+						include: "#statement_context"
+					}
+				]
 			},
 			{
-				begin: "#",
-				beginCaptures: {
-					"0": {
-						name: "punctuation.definition.comment.shell"
+				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"
 					}
-				},
-				end: "$",
+				]
+			}
+		},
+		name: "meta.command_name.shell"
+	},
+	comment: {
+		match: "(?<=^|\\s)(?:((#!).*)|((#).*))",
+		captures: {
+			"1": {
+				name: "comment.line.number-sign.shell meta.shebang.shell"
+			},
+			"2": {
+				name: "punctuation.definition.comment.shebang.shell"
+			},
+			"3": {
 				name: "comment.line.number-sign.shell"
+			},
+			"4": {
+				name: "punctuation.definition.comment.shell"
+			}
+		}
+	},
+	comments: {
+		patterns: [
+			{
+				include: "#block_comment"
+			},
+			{
+				include: "#line_comment"
 			}
 		]
 	},
@@ -165,7 +368,7 @@ var repository = {
 						include: "#logical-expression"
 					},
 					{
-						include: "$self"
+						include: "#initial_context"
 					}
 				]
 			},
@@ -205,7 +408,7 @@ var repository = {
 				name: "meta.scope.subshell.shell",
 				patterns: [
 					{
-						include: "$self"
+						include: "#initial_context"
 					}
 				]
 			},
@@ -225,16 +428,28 @@ var repository = {
 				name: "meta.scope.group.shell",
 				patterns: [
 					{
-						include: "$self"
+						include: "#initial_context"
 					}
 				]
 			}
 		]
 	},
+	custom_command_names: {
+		patterns: [
+		]
+	},
+	custom_commands: {
+		patterns: [
+		]
+	},
+	double_quote_escape_char: {
+		match: "\\\\[\\$`\"\\\\\\n]",
+		name: "constant.character.escape.shell"
+	},
 	"function-definition": {
 		patterns: [
 			{
-				begin: "(?<=^|;|&|\\s)(function)\\s+([^\\s\\\\]+)(?:\\s*(\\(\\)))?",
+				begin: "(?:^\\s*|(?<=^|;|&|\\s))(function)\\s+([^\\s\\\\]+)(?:\\s*(\\(\\)))?",
 				beginCaptures: {
 					"1": {
 						name: "storage.type.function.shell"
@@ -255,12 +470,12 @@ var repository = {
 				name: "meta.function.shell",
 				patterns: [
 					{
-						include: "$self"
+						include: "#initial_context"
 					}
 				]
 			},
 			{
-				begin: "(?<=^|;|&|\\s)([^\\s\\\\=]+)\\s*(\\(\\))",
+				begin: "(?:^\\s*|(?<=^|;|&|\\s))([^\\s\\\\=]+)\\s*(\\(\\))",
 				beginCaptures: {
 					"1": {
 						name: "entity.name.function.shell"
@@ -278,7 +493,7 @@ var repository = {
 				name: "meta.function.shell",
 				patterns: [
 					{
-						include: "$self"
+						include: "#initial_context"
 					}
 				]
 			}
@@ -287,509 +502,272 @@ var repository = {
 	heredoc: {
 		patterns: [
 			{
-				begin: "(<<)-\\s*(\"|'|)\\s*(RUBY)(?=\\s|;|&|<|\"|')\\2",
+				begin: "(<<-)\\s*+(\"|')\\s*+((?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w))(?=\\s|;|&|<|\"|')\\2",
+				end: "^\\t*\\3(?=\\s|;|&|$)",
 				beginCaptures: {
 					"1": {
 						name: "keyword.operator.heredoc.shell"
 					},
+					"2": {
+					},
 					"3": {
-						name: "keyword.control.heredoc-token.shell"
+						name: "punctuation.definition.string.heredoc.shell"
 					}
 				},
-				end: "^\\t*(RUBY)(?=\\s|;|&|$)",
 				endCaptures: {
-					"1": {
-						name: "keyword.control.heredoc-token.shell"
+					"0": {
+						name: "punctuation.definition.string.heredoc.shell"
 					}
 				},
-				name: "string.unquoted.heredoc.no-indent.ruby.shell",
-				contentName: "source.ruby.embedded.shell",
+				name: "string.quoted.heredoc.indent.shell",
 				patterns: [
-					{
-						include: "source.ruby"
-					}
 				]
 			},
 			{
-				begin: "(<<)\\s*(\"|'|)\\s*(RUBY)(?=\\s|;|&|<|\"|')\\2",
+				begin: "(<<)\\s*+(\"|')\\s*+((?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w))(?=\\s|;|&|<|\"|')\\2",
+				end: "^\\3(?=\\s|;|&|$)",
 				beginCaptures: {
 					"1": {
 						name: "keyword.operator.heredoc.shell"
 					},
+					"2": {
+					},
 					"3": {
-						name: "keyword.control.heredoc-token.shell"
+						name: "punctuation.definition.string.heredoc.shell"
 					}
 				},
-				end: "^(RUBY)(?=\\s|;|&|$)",
 				endCaptures: {
-					"1": {
-						name: "keyword.control.heredoc-token.shell"
+					"0": {
+						name: "punctuation.definition.string.heredoc.shell"
 					}
 				},
-				name: "string.unquoted.heredoc.ruby.shell",
-				contentName: "source.ruby.embedded.shell",
+				name: "string.quoted.heredoc.no-indent.shell",
 				patterns: [
-					{
-						include: "source.ruby"
-					}
 				]
 			},
 			{
-				begin: "(<<)-\\s*(\"|'|)\\s*(PYTHON)(?=\\s|;|&|<|\"|')\\2",
+				begin: "(<<-)\\s*+((?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w))(?=\\s|;|&|<|\"|')",
+				end: "^\\t*\\2(?=\\s|;|&|$)",
 				beginCaptures: {
 					"1": {
 						name: "keyword.operator.heredoc.shell"
 					},
-					"3": {
-						name: "keyword.control.heredoc-token.shell"
+					"2": {
+						name: "punctuation.definition.string.heredoc.shell"
 					}
 				},
-				end: "^\\t*(PYTHON)(?=\\s|;|&|$)",
 				endCaptures: {
-					"1": {
-						name: "keyword.control.heredoc-token.shell"
+					"0": {
+						name: "punctuation.definition.string.heredoc.shell"
 					}
 				},
-				name: "string.unquoted.heredoc.no-indent.python.shell",
-				contentName: "source.python.embedded.shell",
+				name: "string.unquoted.heredoc.indent.shell",
 				patterns: [
 					{
-						include: "source.python"
+						include: "#double_quote_escape_char"
+					},
+					{
+						include: "#variable"
+					},
+					{
+						include: "#interpolation"
 					}
 				]
 			},
 			{
-				begin: "(<<)\\s*(\"|'|)\\s*(PYTHON)(?=\\s|;|&|<|\"|')\\2",
+				begin: "(<<)\\s*+((?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w))(?=\\s|;|&|<|\"|')",
+				end: "^\\2(?=\\s|;|&|$)",
 				beginCaptures: {
 					"1": {
 						name: "keyword.operator.heredoc.shell"
 					},
-					"3": {
-						name: "keyword.control.heredoc-token.shell"
+					"2": {
+						name: "punctuation.definition.string.heredoc.shell"
 					}
 				},
-				end: "^(PYTHON)(?=\\s|;|&|$)",
 				endCaptures: {
-					"1": {
-						name: "keyword.control.heredoc-token.shell"
+					"0": {
+						name: "punctuation.definition.string.heredoc.shell"
 					}
 				},
-				name: "string.unquoted.heredoc.python.shell",
-				contentName: "source.python.embedded.shell",
+				name: "string.unquoted.heredoc.no-indent.shell",
 				patterns: [
 					{
-						include: "source.python"
+						include: "#double_quote_escape_char"
+					},
+					{
+						include: "#variable"
+					},
+					{
+						include: "#interpolation"
 					}
 				]
-			},
+			}
+		]
+	},
+	herestring: {
+		patterns: [
 			{
-				begin: "(<<)-\\s*(\"|'|)\\s*(APPLESCRIPT)(?=\\s|;|&|<|\"|')\\2",
+				begin: "(<<<)\\s*(('))",
 				beginCaptures: {
 					"1": {
-						name: "keyword.operator.heredoc.shell"
+						name: "keyword.operator.herestring.shell"
+					},
+					"2": {
+						name: "string.quoted.single.shell"
 					},
 					"3": {
-						name: "keyword.control.heredoc-token.shell"
+						name: "punctuation.definition.string.begin.shell"
 					}
 				},
-				end: "^\\t*(APPLESCRIPT)(?=\\s|;|&|$)",
+				end: "(')",
 				endCaptures: {
+					"0": {
+						name: "string.quoted.single.shell"
+					},
 					"1": {
-						name: "keyword.control.heredoc-token.shell"
+						name: "punctuation.definition.string.end.shell"
 					}
 				},
-				name: "string.unquoted.heredoc.no-indent.applescript.shell",
-				contentName: "source.applescript.embedded.shell",
-				patterns: [
-					{
-						include: "source.applescript"
-					}
-				]
+				name: "meta.herestring.shell",
+				contentName: "string.quoted.single.shell"
 			},
 			{
-				begin: "(<<)\\s*(\"|'|)\\s*(APPLESCRIPT)(?=\\s|;|&|<|\"|')\\2",
+				begin: "(<<<)\\s*((\"))",
 				beginCaptures: {
 					"1": {
-						name: "keyword.operator.heredoc.shell"
+						name: "keyword.operator.herestring.shell"
+					},
+					"2": {
+						name: "string.quoted.double.shell"
 					},
 					"3": {
-						name: "keyword.control.heredoc-token.shell"
+						name: "punctuation.definition.string.begin.shell"
 					}
 				},
-				end: "^(APPLESCRIPT)(?=\\s|;|&|$)",
+				end: "(\")",
 				endCaptures: {
+					"0": {
+						name: "string.quoted.double.shell"
+					},
 					"1": {
-						name: "keyword.control.heredoc-token.shell"
+						name: "punctuation.definition.string.end.shell"
 					}
 				},
-				name: "string.unquoted.heredoc.applescript.shell",
-				contentName: "source.applescript.embedded.shell",
-				patterns: [
-					{
-						include: "source.applescript"
-					}
-				]
+				name: "meta.herestring.shell",
+				contentName: "string.quoted.double.shell"
 			},
 			{
-				begin: "(<<)-\\s*(\"|'|)\\s*(HTML)(?=\\s|;|&|<|\"|')\\2",
-				beginCaptures: {
+				captures: {
 					"1": {
-						name: "keyword.operator.heredoc.shell"
+						name: "keyword.operator.herestring.shell"
 					},
-					"3": {
-						name: "keyword.control.heredoc-token.shell"
+					"2": {
+						name: "string.unquoted.herestring.shell",
+						patterns: [
+							{
+								include: "#initial_context"
+							}
+						]
 					}
 				},
-				end: "^\\t*(HTML)(?=\\s|;|&|$)",
-				endCaptures: {
-					"1": {
-						name: "keyword.control.heredoc-token.shell"
-					}
-				},
-				name: "string.unquoted.heredoc.no-indent.html.shell",
-				contentName: "text.html.embedded.shell",
-				patterns: [
-					{
-						include: "text.html.basic"
-					}
-				]
+				match: "(<<<)\\s*(([^\\s)\\\\]|\\\\.)+)",
+				name: "meta.herestring.shell"
+			}
+		]
+	},
+	initial_context: {
+		patterns: [
+			{
+				include: "#comment"
 			},
 			{
-				begin: "(<<)\\s*(\"|'|)\\s*(HTML)(?=\\s|;|&|<|\"|')\\2",
-				beginCaptures: {
-					"1": {
-						name: "keyword.operator.heredoc.shell"
-					},
-					"3": {
-						name: "keyword.control.heredoc-token.shell"
-					}
-				},
-				end: "^(HTML)(?=\\s|;|&|$)",
-				endCaptures: {
-					"1": {
-						name: "keyword.control.heredoc-token.shell"
-					}
-				},
-				name: "string.unquoted.heredoc.html.shell",
-				contentName: "text.html.embedded.shell",
-				patterns: [
-					{
-						include: "text.html.basic"
-					}
-				]
+				include: "#boolean"
 			},
 			{
-				begin: "(<<)-\\s*(\"|'|)\\s*(MARKDOWN)(?=\\s|;|&|<|\"|')\\2",
-				beginCaptures: {
-					"1": {
-						name: "keyword.operator.heredoc.shell"
-					},
-					"3": {
-						name: "keyword.control.heredoc-token.shell"
-					}
-				},
-				end: "^\\t*(MARKDOWN)(?=\\s|;|&|$)",
-				endCaptures: {
-					"1": {
-						name: "keyword.control.heredoc-token.shell"
-					}
-				},
-				name: "string.unquoted.heredoc.no-indent.markdown.shell",
-				contentName: "text.html.markdown.embedded.shell",
-				patterns: [
-					{
-						include: "text.html.markdown"
-					}
-				]
+				include: "#numeric_literal"
 			},
 			{
-				begin: "(<<)\\s*(\"|'|)\\s*(MARKDOWN)(?=\\s|;|&|<|\"|')\\2",
-				beginCaptures: {
-					"1": {
-						name: "keyword.operator.heredoc.shell"
-					},
-					"3": {
-						name: "keyword.control.heredoc-token.shell"
-					}
-				},
-				end: "^(MARKDOWN)(?=\\s|;|&|$)",
-				endCaptures: {
-					"1": {
-						name: "keyword.control.heredoc-token.shell"
-					}
-				},
-				name: "string.unquoted.heredoc.markdown.shell",
-				contentName: "text.html.markdown.embedded.shell",
-				patterns: [
-					{
-						include: "text.html.markdown"
-					}
-				]
+				include: "#pipeline"
 			},
 			{
-				begin: "(<<)-\\s*(\"|'|)\\s*(TEXTILE)(?=\\s|;|&|<|\"|')\\2",
-				beginCaptures: {
-					"1": {
-						name: "keyword.operator.heredoc.shell"
-					},
-					"3": {
-						name: "keyword.control.heredoc-token.shell"
-					}
-				},
-				end: "^\\t*(TEXTILE)(?=\\s|;|&|$)",
-				endCaptures: {
-					"1": {
-						name: "keyword.control.heredoc-token.shell"
-					}
-				},
-				name: "string.unquoted.heredoc.no-indent.textile.shell",
-				contentName: "text.html.textile.embedded.shell",
-				patterns: [
-					{
-						include: "text.html.textile"
-					}
-				]
+				include: "#statement_seperator"
 			},
 			{
-				begin: "(<<)\\s*(\"|'|)\\s*(TEXTILE)(?=\\s|;|&|<|\"|')\\2",
-				beginCaptures: {
-					"1": {
-						name: "keyword.operator.heredoc.shell"
-					},
-					"3": {
-						name: "keyword.control.heredoc-token.shell"
-					}
-				},
-				end: "^(TEXTILE)(?=\\s|;|&|$)",
-				endCaptures: {
-					"1": {
-						name: "keyword.control.heredoc-token.shell"
-					}
-				},
-				name: "string.unquoted.heredoc.textile.shell",
-				contentName: "text.html.textile.embedded.shell",
-				patterns: [
-					{
-						include: "text.html.textile"
-					}
-				]
+				include: "#logical_expression_double"
 			},
 			{
-				begin: "(<<)-\\s*(\"|'|)\\s*(SHELL)(?=\\s|;|&|<|\"|')\\2",
-				beginCaptures: {
-					"1": {
-						name: "keyword.operator.heredoc.shell"
-					},
-					"3": {
-						name: "keyword.control.heredoc-token.shell"
-					}
-				},
-				end: "^\\t*(\\3)(?=\\s|;|&|$)",
-				endCaptures: {
-					"1": {
-						name: "keyword.control.heredoc-token.shell"
-					}
-				},
-				contentName: "source.shell.embedded.shell",
-				name: "string.unquoted.heredoc.no-indent.shell.shell",
-				patterns: [
-					{
-						include: "source.shell"
-					}
-				]
+				include: "#logical_expression_single"
 			},
 			{
-				begin: "(<<)\\s*(\"|'|)\\s*(SHELL)(?=\\s|;|&|<|\"|')\\2",
-				beginCaptures: {
-					"1": {
-						name: "keyword.operator.heredoc.shell"
-					},
-					"3": {
-						name: "keyword.control.heredoc-token.shell"
-					}
-				},
-				end: "^(\\3)(?=\\s|;|&|$)",
-				endCaptures: {
-					"1": {
-						name: "keyword.control.heredoc-token.shell"
-					}
-				},
-				name: "string.unquoted.heredoc.shell.shell",
-				contentName: "source.shell.embedded.shell",
-				patterns: [
-					{
-						include: "source.shell"
-					}
-				]
+				include: "#misc_ranges"
 			},
 			{
-				begin: "(<<)-\\s*(\"|')\\s*\\\\?([^;&<\\s]+)\\2",
-				beginCaptures: {
-					"1": {
-						name: "keyword.operator.heredoc.shell"
-					},
-					"3": {
-						name: "keyword.control.heredoc-token.shell"
-					}
-				},
-				end: "^\\t*(\\3)(?=\\s|;|&|$)",
-				endCaptures: {
-					"1": {
-						name: "keyword.control.heredoc-token.shell"
-					}
-				},
-				name: "string.unquoted.heredoc.no-indent.shell"
+				include: "#loop"
 			},
 			{
-				begin: "(<<)\\s*(\"|')\\s*\\\\?([^;&<\\s]+)\\2",
-				beginCaptures: {
-					"1": {
-						name: "keyword.operator.heredoc.shell"
-					},
-					"3": {
-						name: "keyword.control.heredoc-token.shell"
-					}
-				},
-				end: "^(\\3)(?=\\s|;|&|$)",
-				endCaptures: {
-					"1": {
-						name: "keyword.control.heredoc-token.shell"
-					}
-				},
-				name: "string.unquoted.heredoc.shell"
+				include: "#string"
 			},
 			{
-				begin: "(<<)-\\s*\\\\?([^;&<\\s]+)",
-				beginCaptures: {
-					"1": {
-						name: "keyword.operator.heredoc.shell"
-					},
-					"2": {
-						name: "keyword.control.heredoc-token.shell"
-					}
-				},
-				end: "^\\t*(\\2)(?=\\s|;|&|$)",
-				endCaptures: {
-					"1": {
-						name: "keyword.control.heredoc-token.shell"
-					}
-				},
-				name: "string.unquoted.heredoc.expanded.no-indent.shell",
-				patterns: [
-					{
-						match: "\\\\[\\$`\\\\\\n]",
-						name: "constant.character.escape.shell"
-					},
-					{
-						include: "#variable"
-					},
-					{
-						include: "#interpolation"
-					}
-				]
+				include: "#function-definition"
 			},
 			{
-				begin: "(<<)\\s*\\\\?([^;&<\\s]+)",
-				beginCaptures: {
-					"1": {
-						name: "keyword.operator.heredoc.shell"
-					},
-					"2": {
-						name: "keyword.control.heredoc-token.shell"
-					}
-				},
-				end: "^(\\2)(?=\\s|;|&|$)",
-				endCaptures: {
-					"1": {
-						name: "keyword.control.heredoc-token.shell"
-					}
-				},
-				name: "string.unquoted.heredoc.expanded.shell",
-				patterns: [
-					{
-						match: "\\\\[\\$`\\\\\\n]",
-						name: "constant.character.escape.shell"
-					},
-					{
-						include: "#variable"
-					},
-					{
-						include: "#interpolation"
-					}
-				]
-			}
-		]
-	},
-	herestring: {
-		patterns: [
+				include: "#variable"
+			},
 			{
-				begin: "(<<<)\\s*(('))",
-				beginCaptures: {
-					"1": {
-						name: "keyword.operator.herestring.shell"
-					},
-					"2": {
-						name: "string.quoted.single.shell"
-					},
-					"3": {
-						name: "punctuation.definition.string.begin.shell"
-					}
-				},
-				end: "(')",
-				endCaptures: {
-					"0": {
-						name: "string.quoted.single.shell"
-					},
-					"1": {
-						name: "punctuation.definition.string.end.shell"
-					}
-				},
-				name: "meta.herestring.shell",
-				contentName: "string.quoted.single.shell"
+				include: "#interpolation"
 			},
 			{
-				begin: "(<<<)\\s*((\"))",
-				beginCaptures: {
-					"1": {
-						name: "keyword.operator.herestring.shell"
-					},
-					"2": {
-						name: "string.quoted.double.shell"
-					},
-					"3": {
-						name: "punctuation.definition.string.begin.shell"
-					}
-				},
-				end: "(\")",
-				endCaptures: {
-					"0": {
-						name: "string.quoted.double.shell"
-					},
-					"1": {
-						name: "punctuation.definition.string.end.shell"
-					}
-				},
-				name: "meta.herestring.shell",
-				contentName: "string.quoted.double.shell"
+				include: "#heredoc"
 			},
 			{
-				captures: {
-					"1": {
-						name: "keyword.operator.herestring.shell"
+				include: "#herestring"
+			},
+			{
+				include: "#redirection"
+			},
+			{
+				include: "#pathname"
+			},
+			{
+				include: "#keyword"
+			},
+			{
+				include: "#alias_statement"
+			},
+			{
+				include: "#assignment"
+			},
+			{
+				include: "#command_call"
+			},
+			{
+				include: "#support"
+			}
+		]
+	},
+	inline_comment: {
+		match: "(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/))",
+		captures: {
+			"1": {
+				name: "comment.block.shell punctuation.definition.comment.begin.shell"
+			},
+			"2": {
+				name: "comment.block.shell"
+			},
+			"3": {
+				patterns: [
+					{
+						match: "\\*\\/",
+						name: "comment.block.shell punctuation.definition.comment.end.shell"
 					},
-					"2": {
-						name: "string.unquoted.herestring.shell",
-						patterns: [
-							{
-								include: "$self"
-							}
-						]
+					{
+						match: "\\*",
+						name: "comment.block.shell"
 					}
-				},
-				match: "(<<<)\\s*(([^\\s)\\\\]|\\\\.)+)",
-				name: "meta.herestring.shell"
+				]
 			}
-		]
+		}
 	},
 	interpolation: {
 		patterns: [
@@ -797,13 +775,13 @@ var repository = {
 				begin: "\\$\\({2}",
 				beginCaptures: {
 					"0": {
-						name: "punctuation.definition.string.begin.shell"
+						name: "punctuation.definition.evaluation.arithmetic.begin.shell"
 					}
 				},
-				end: "\\){2}",
+				end: "\\)\\s*\\)",
 				endCaptures: {
 					"0": {
-						name: "punctuation.definition.string.end.shell"
+						name: "punctuation.definition.evaluation.arithmetic.end.shell"
 					}
 				},
 				name: "string.other.math.shell",
@@ -817,13 +795,13 @@ var repository = {
 				begin: "`",
 				beginCaptures: {
 					"0": {
-						name: "punctuation.definition.string.begin.shell"
+						name: "punctuation.definition.evaluation.backticks.shell"
 					}
 				},
 				end: "`",
 				endCaptures: {
 					"0": {
-						name: "punctuation.definition.string.end.shell"
+						name: "punctuation.definition.evaluation.backticks.shell"
 					}
 				},
 				name: "string.interpolated.backtick.shell",
@@ -854,7 +832,7 @@ var repository = {
 						]
 					},
 					{
-						include: "$self"
+						include: "#initial_context"
 					}
 				]
 			},
@@ -862,19 +840,19 @@ var repository = {
 				begin: "\\$\\(",
 				beginCaptures: {
 					"0": {
-						name: "punctuation.definition.string.begin.shell"
+						name: "punctuation.definition.evaluation.parens.begin.shell"
 					}
 				},
 				end: "\\)",
 				endCaptures: {
 					"0": {
-						name: "punctuation.definition.string.end.shell"
+						name: "punctuation.definition.evaluation.parens.end.shell"
 					}
 				},
 				name: "string.interpolated.dollar.shell",
 				patterns: [
 					{
-						include: "$self"
+						include: "#initial_context"
 					}
 				]
 			}
@@ -883,33 +861,237 @@ var repository = {
 	keyword: {
 		patterns: [
 			{
-				match: "(?<=^|;|&|\\s)(then|else|elif|fi|for|in|do|done|select|case|continue|esac|while|until|return)(?=\\s|;|&|$)",
-				name: "keyword.control.shell"
+				match: "(?<=^|;|&|\\s)(?:then|else|elif|fi|for|in|do|done|select|case|continue|esac|while|until|return)(?=\\s|;|&|$)",
+				name: "keyword.control.$0.shell"
+			},
+			{
+				match: "(?<=^|;|&|\\s)(?:export|declare|typeset|local|readonly)(?=\\s|;|&|$)",
+				name: "storage.modifier.$0.shell"
+			}
+		]
+	},
+	line_comment: {
+		begin: "\\s*+(\\/\\/)",
+		end: "(?<=\\n)(?<!\\\\\\n)",
+		beginCaptures: {
+			"1": {
+				name: "punctuation.definition.comment.shell"
+			}
+		},
+		endCaptures: {
+		},
+		name: "comment.line.double-slash.shell",
+		patterns: [
+			{
+				include: "#line_continuation_character"
+			}
+		]
+	},
+	line_continuation: {
+		match: "\\\\(?=\\n)",
+		name: "constant.character.escape.line-continuation.shell"
+	},
+	"logical-expression": {
+		patterns: [
+			{
+				comment: "do we want a special rule for ( expr )?",
+				match: "=[=~]?|!=?|<|>|&&|\\|\\|",
+				name: "keyword.operator.logical.shell"
+			},
+			{
+				match: "(?<!\\S)-(nt|ot|ef|eq|ne|l[te]|g[te]|[a-hknoprstuwxzOGLSN])\\b",
+				name: "keyword.operator.logical.shell"
+			}
+		]
+	},
+	logical_expression_context: {
+		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"
+			}
+		]
+	},
+	logical_expression_double: {
+		begin: "\\[\\[",
+		end: "\\]\\]",
+		beginCaptures: {
+			"0": {
+				name: "punctuation.definition.logical-expression.shell"
+			}
+		},
+		endCaptures: {
+			"0": {
+				name: "punctuation.definition.logical-expression.shell"
+			}
+		},
+		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"
 			},
 			{
-				match: "(?<=^|;|&|\\s)(?:export|declare|typeset|local|readonly)(?=\\s|;|&|$)",
-				name: "storage.modifier.shell"
-			}
-		]
-	},
-	list: {
-		patterns: [
+				include: "#keyword"
+			},
 			{
-				match: ";|&&|&|\\|\\|",
-				name: "keyword.operator.list.shell"
+				include: "#support"
 			}
 		]
 	},
-	"logical-expression": {
+	logical_expression_single: {
+		begin: "\\[",
+		end: "\\]",
+		beginCaptures: {
+			"0": {
+				name: "punctuation.definition.logical-expression.shell"
+			}
+		},
+		endCaptures: {
+			"0": {
+				name: "punctuation.definition.logical-expression.shell"
+			}
+		},
+		name: "meta.scope.logical-expression.shell",
 		patterns: [
 			{
-				comment: "do we want a special rule for ( expr )?",
-				match: "=[=~]?|!=?|<|>|&&|\\|\\|",
-				name: "keyword.operator.logical.shell"
+				include: "#regex_comparison"
 			},
 			{
-				match: "(?<!\\S)-(nt|ot|ef|eq|ne|l[te]|g[te]|[a-hknoprstuwxzOGLSN])",
-				name: "keyword.operator.logical.shell"
+				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"
 			}
 		]
 	},
@@ -922,7 +1104,7 @@ var repository = {
 						name: "keyword.control.shell"
 					}
 				},
-				end: "(?<=^|;|&|\\s)done(?=\\s|;|&|$)",
+				end: "(?<=^|;|&|\\s)done(?=\\s|;|&|$|\\))",
 				endCaptures: {
 					"0": {
 						name: "keyword.control.shell"
@@ -931,7 +1113,7 @@ var repository = {
 				name: "meta.scope.for-loop.shell",
 				patterns: [
 					{
-						include: "$self"
+						include: "#initial_context"
 					}
 				]
 			},
@@ -953,7 +1135,7 @@ var repository = {
 						name: "keyword.control.shell"
 					}
 				},
-				end: "(?<=^|;|&|\\s)done(?=\\s|;|&|$)",
+				end: "(?<=^|;|&|\\s)done(?=\\s|;|&|$|\\))",
 				endCaptures: {
 					"0": {
 						name: "keyword.control.shell"
@@ -962,7 +1144,7 @@ var repository = {
 				name: "meta.scope.for-in-loop.shell",
 				patterns: [
 					{
-						include: "$self"
+						include: "#initial_context"
 					}
 				]
 			},
@@ -973,7 +1155,7 @@ var repository = {
 						name: "keyword.control.shell"
 					}
 				},
-				end: "(?<=^|;|&|\\s)done(?=\\s|;|&|$)",
+				end: "(?<=^|;|&|\\s)done(?=\\s|;|&|$|\\))",
 				endCaptures: {
 					"0": {
 						name: "keyword.control.shell"
@@ -982,7 +1164,7 @@ var repository = {
 				name: "meta.scope.while-loop.shell",
 				patterns: [
 					{
-						include: "$self"
+						include: "#initial_context"
 					}
 				]
 			},
@@ -996,7 +1178,7 @@ var repository = {
 						name: "variable.other.loop.shell"
 					}
 				},
-				end: "(?<=^|;|&|\\s)(done)(?=\\s|;|&|$)",
+				end: "(?<=^|;|&|\\s)(done)(?=\\s|;|&|$|\\))",
 				endCaptures: {
 					"1": {
 						name: "keyword.control.shell"
@@ -1005,7 +1187,7 @@ var repository = {
 				name: "meta.scope.select-block.shell",
 				patterns: [
 					{
-						include: "$self"
+						include: "#initial_context"
 					}
 				]
 			},
@@ -1039,14 +1221,11 @@ var repository = {
 							},
 							{
 								include: "#case-clause"
-							},
-							{
-								include: "$self"
 							}
 						]
 					},
 					{
-						include: "$self"
+						include: "#initial_context"
 					}
 				]
 			},
@@ -1066,7 +1245,7 @@ var repository = {
 				name: "meta.scope.if-block.shell",
 				patterns: [
 					{
-						include: "$self"
+						include: "#initial_context"
 					}
 				]
 			}
@@ -1099,6 +1278,383 @@ var repository = {
 			}
 		]
 	},
+	misc_ranges: {
+		patterns: [
+			{
+				include: "#logical_expression_single"
+			},
+			{
+				include: "#logical_expression_double"
+			},
+			{
+				begin: "\\(\\(",
+				end: "\\)\\)",
+				beginCaptures: {
+					"0": {
+						name: "punctuation.section.arithmetic.shell"
+					}
+				},
+				endCaptures: {
+					"0": {
+						name: "punctuation.section.arithmetic.shell"
+					}
+				},
+				name: "meta.arithmetic.shell",
+				patterns: [
+					{
+						include: "#math"
+					}
+				]
+			},
+			{
+				begin: "(?<!=)\\(",
+				end: "\\)",
+				beginCaptures: {
+					"0": {
+						name: "punctuation.definition.subshell"
+					}
+				},
+				endCaptures: {
+					"0": {
+						name: "punctuation.definition.subshell"
+					}
+				},
+				name: "meta.scope.subshell",
+				patterns: [
+					{
+						include: "#initial_context"
+					}
+				]
+			},
+			{
+				begin: "{",
+				end: "}",
+				beginCaptures: {
+					"0": {
+						name: "punctuation.definition.group.shell"
+					}
+				},
+				endCaptures: {
+					"0": {
+						name: "punctuation.definition.group.shell"
+					}
+				},
+				name: "meta.scope.group.shell",
+				patterns: [
+					{
+						include: "#initial_context"
+					}
+				]
+			}
+		]
+	},
+	numeric_literal: {
+		match: "(?<!\\w)((?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])*)(?!\\w)",
+		captures: {
+			"1": {
+				patterns: [
+					{
+						begin: "(?=.)",
+						end: "$",
+						beginCaptures: {
+						},
+						endCaptures: {
+						},
+						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"
+									}
+								}
+							},
+							{
+								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: "(\\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: "(\\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"
+									}
+								}
+							},
+							{
+								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))?$",
+								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"
+									}
+								}
+							},
+							{
+								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: {
+									"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: "keyword.other.unit.exponent.decimal.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"
+											}
+										]
+									},
+									"7": {
+										name: "keyword.other.unit.suffix.integer.shell"
+									}
+								}
+							}
+						]
+					}
+				]
+			}
+		}
+	},
+	option: {
+		begin: "\\s++(-)((?!(?:!|%|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|\\s)))",
+		end: "(?:(?=\\s)|(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|#|\\])(?<!\\\\))",
+		beginCaptures: {
+			"1": {
+				name: "string.unquoted.argument.shell constant.other.option.dash.shell"
+			},
+			"2": {
+				name: "string.unquoted.argument.shell constant.other.option.shell"
+			}
+		},
+		endCaptures: {
+		},
+		contentName: "string.unquoted.argument constant.other.option",
+		patterns: [
+			{
+				include: "#option_context"
+			}
+		]
+	},
+	option_context: {
+		patterns: [
+			{
+				include: "#misc_ranges"
+			},
+			{
+				include: "#string"
+			},
+			{
+				include: "#variable"
+			},
+			{
+				include: "#interpolation"
+			},
+			{
+				include: "#heredoc"
+			},
+			{
+				include: "#herestring"
+			},
+			{
+				include: "#redirection"
+			},
+			{
+				include: "#pathname"
+			},
+			{
+				include: "#keyword"
+			},
+			{
+				include: "#support"
+			}
+		]
+	},
 	pathname: {
 		patterns: [
 			{
@@ -1128,7 +1684,7 @@ var repository = {
 				name: "meta.structure.extglob.shell",
 				patterns: [
 					{
-						include: "$self"
+						include: "#initial_context"
 					}
 				]
 			}
@@ -1164,7 +1720,7 @@ var repository = {
 				name: "string.interpolated.process-substitution.shell",
 				patterns: [
 					{
-						include: "$self"
+						include: "#initial_context"
 					}
 				]
 			},
@@ -1174,6 +1730,97 @@ var repository = {
 			}
 		]
 	},
+	regex_comparison: {
+		match: "\\=~",
+		name: "keyword.operator.logical.regex.shell"
+	},
+	regexp: {
+		patterns: [
+			{
+				match: ".+"
+			}
+		]
+	},
+	simple_options: {
+		match: "(?:\\s++\\-\\w+)*",
+		captures: {
+			"0": {
+				patterns: [
+					{
+						match: "\\s++(\\-)(\\w+)",
+						captures: {
+							"1": {
+								name: "string.unquoted.argument.shell constant.other.option.dash.shell"
+							},
+							"2": {
+								name: "string.unquoted.argument.shell constant.other.option.shell"
+							}
+						}
+					}
+				]
+			}
+		}
+	},
+	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"
+			}
+		]
+	},
+	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"
+			}
+		}
+	},
 	string: {
 		patterns: [
 			{
@@ -1196,7 +1843,7 @@ var repository = {
 				name: "string.quoted.single.shell"
 			},
 			{
-				begin: "\\$?\"",
+				begin: " *\\$?\"",
 				beginCaptures: {
 					"0": {
 						name: "punctuation.definition.string.begin.shell"
@@ -1257,76 +1904,83 @@ var repository = {
 			}
 		]
 	},
-	support: {
+	variable: {
 		patterns: [
 			{
-				match: "(?<=^|;|&|\\s)(?::|\\.)(?=\\s|;|&|$)",
-				name: "support.function.builtin.shell"
+				match: "(\\$)(\\@(?!\\w))",
+				captures: {
+					"1": {
+						name: "punctuation.definition.variable.shell variable.parameter.positional.all.shell"
+					},
+					"2": {
+						name: "variable.parameter.positional.all.shell"
+					}
+				}
 			},
 			{
-				match: "(?<=^|;|&|\\s)(?:alias|bg|bind|break|builtin|caller|cd|command|compgen|complete|dirs|disown|echo|enable|eval|exec|exit|false|fc|fg|getopts|hash|help|history|jobs|kill|let|logout|popd|printf|pushd|pwd|read|readonly|set|shift|shopt|source|suspend|test|times|trap|true|type|ulimit|umask|unalias|unset|wait)(?=\\s|;|&|$)",
-				name: "support.function.builtin.shell"
-			}
-		]
-	},
-	variable: {
-		patterns: [
-			{
+				match: "(\\$)([0-9](?!\\w))",
 				captures: {
 					"1": {
-						name: "punctuation.definition.variable.shell"
+						name: "punctuation.definition.variable.shell variable.parameter.positional.shell"
+					},
+					"2": {
+						name: "variable.parameter.positional.shell"
 					}
-				},
-				match: "(\\$)[a-zA-Z_][a-zA-Z0-9_]*",
-				name: "variable.other.normal.shell"
+				}
 			},
 			{
+				match: "(\\$)(\\{[0-9]+\\}(?!\\w))",
 				captures: {
 					"1": {
-						name: "punctuation.definition.variable.shell"
+						name: "punctuation.definition.variable.shell variable.parameter.positional.shell"
+					},
+					"2": {
+						name: "variable.parameter.positional.shell"
 					}
-				},
-				match: "(\\$)[-*@#?$!0_]",
-				name: "variable.other.special.shell"
+				}
 			},
 			{
+				match: "(\\$)([-*#?$!0_](?!\\w))",
 				captures: {
 					"1": {
-						name: "punctuation.definition.variable.shell"
+						name: "punctuation.definition.variable.shell variable.language.special.shell"
+					},
+					"2": {
+						name: "variable.language.special.shell"
 					}
-				},
-				match: "(\\$)[1-9]",
-				name: "variable.other.positional.shell"
+				}
 			},
 			{
-				begin: "\\${",
+				begin: "(\\$)(\\{)",
+				end: "\\}",
 				beginCaptures: {
-					"0": {
-						name: "punctuation.definition.variable.shell"
+					"1": {
+						name: "punctuation.definition.variable.shell punctuation.section.bracket.curly.variable.begin.shell"
+					},
+					"2": {
+						name: "punctuation.section.bracket.curly.variable.begin.shell"
 					}
 				},
-				end: "}",
 				endCaptures: {
 					"0": {
-						name: "punctuation.definition.variable.shell"
+						name: "punctuation.section.bracket.curly.variable.end.shell"
 					}
 				},
-				name: "variable.other.bracket.shell",
 				patterns: [
 					{
-						match: "!|:[-=?]?|\\*|@|#{1,2}|%{1,2}|/",
+						match: "!|:[-=?]?|\\*|@|##|#|%%|%|\\/",
 						name: "keyword.operator.expansion.shell"
 					},
 					{
+						match: "(\\[)[^\\]]+(\\])",
 						captures: {
 							"1": {
 								name: "punctuation.section.array.shell"
 							},
-							"3": {
+							"2": {
 								name: "punctuation.section.array.shell"
 							}
-						},
-						match: "(\\[)([^\\]]+)(\\])"
+						}
 					},
 					{
 						include: "#variable"
@@ -1335,6 +1989,17 @@ var repository = {
 						include: "#string"
 					}
 				]
+			},
+			{
+				match: "(\\$)(\\w+(?!\\w))",
+				captures: {
+					"1": {
+						name: "punctuation.definition.variable.shell variable.other.normal.shell"
+					},
+					"2": {
+						name: "variable.other.normal.shell"
+					}
+				}
 			}
 		]
 	}