[shell] switch grammar to atom/language-shellscript

extensions/shellscript/package.json

@@ -4,7 +4,7 @@
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js textmate/shellscript.tmbundle Syntaxes/Shell-Unix-Bash.tmLanguage ./syntaxes/Shell-Unix-Bash.tmLanguage.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js atom/language-shellscript grammars/shell-unix-bash.cson ./syntaxes/shell-unix-bash.tmLanguage.json"
 	},
 	"contributes": {
 		"languages": [{
@@ -19,7 +19,7 @@
 		"grammars": [{
 			"language": "shellscript",
 			"scopeName": "source.shell",
-			"path": "./syntaxes/Shell-Unix-Bash.tmLanguage.json"
+			"path": "./syntaxes/shell-unix-bash.tmLanguage.json"
 		}]
 	}
 }

extensions/shellscript/test/colorize-results/test_sh.json

 [
 	{
 		"c": "#!",
-		"t": "source.shell comment.line.shebang.shell punctuation.definition.comment.line.shebang.shell",
+		"t": "source.shell comment.line.number-sign.shebang.shell punctuation.definition.comment.shebang.shell",
 		"r": {
 			"dark_plus": "comment: #608B4E",
 			"light_plus": "comment: #008000",
@@ -12,7 +12,7 @@
 	},
 	{
 		"c": "/usr/bin/env bash",
-		"t": "source.shell comment.line.shebang.shell",
+		"t": "source.shell comment.line.number-sign.shebang.shell",
 		"r": {
 			"dark_plus": "comment: #608B4E",
 			"light_plus": "comment: #008000",
@@ -243,7 +243,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell",
+		"t": "source.shell meta.scope.if-block.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1144,7 +1144,7 @@
 		}
 	},
 	{
-		"c": "code",
+		"c": "code()",
 		"t": "source.shell meta.function.shell entity.name.function.shell",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
@@ -1154,17 +1154,6 @@
 			"hc_black": "entity.name.function: #DCDCAA"
 		}
 	},
-	{
-		"c": "()",
-		"t": "source.shell meta.function.shell punctuation.definition.arguments.shell",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
 	{
 		"c": " ",
 		"t": "source.shell meta.function.shell",
@@ -1431,7 +1420,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",