Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode'

lib/vscode/extensions/shellscript/.vscodeignore

@@ -0,0 +1,2 @@
+test/**
+cgmanifest.json

lib/vscode/extensions/shellscript/cgmanifest.json

@@ -0,0 +1,18 @@
+{
+	"registrations": [
+		{
+			"component": {
+				"type": "git",
+				"git": {
+					"name": "atom/language-shellscript",
+					"repositoryUrl": "https://github.com/atom/language-shellscript",
+					"commitHash": "4c3711edbe8eac6f501976893976b1ac6a043d50"
+				}
+			},
+			"license": "MIT",
+			"description": "The file syntaxes/shell-unix-bash.tmLanguage.json was derived from the Atom package https://github.com/atom/language-shellscript which was originally converted from the TextMate bundle https://github.com/textmate/shellscript.tmbundle.",
+			"version": "0.26.0"
+		}
+	],
+	"version": 1
+}

lib/vscode/extensions/shellscript/language-configuration.json

@@ -0,0 +1,32 @@
+{
+	"comments": {
+		"lineComment": "#"
+	},
+	"brackets": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"]
+	],
+	"autoClosingPairs": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"],
+		{ "open": "\"", "close": "\"", "notIn": ["string"] },
+		{ "open": "'", "close": "'", "notIn": ["string"] },
+		{ "open": "`", "close": "`", "notIn": ["string"] }
+	],
+	"surroundingPairs": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"],
+		["\"", "\""],
+		["'", "'"],
+		["`", "`"]
+	],
+	"folding": {
+		"markers": {
+			"start": "^\\s*#\\s*#?region\\b.*",
+			"end": "^\\s*#\\s*#?endregion\\b.*"
+		}
+	}
+}

lib/vscode/extensions/shellscript/package.json

@@ -0,0 +1,70 @@
+{
+	"name": "shellscript",
+	"displayName": "%displayName%",
+	"description": "%description%",
+	"version": "1.0.0",
+	"publisher": "vscode",
+	"license": "MIT",
+	"engines": { "vscode": "*" },
+	"scripts": {
+		"update-grammar": "node ../../build/npm/update-grammar.js atom/language-shellscript grammars/shell-unix-bash.cson ./syntaxes/shell-unix-bash.tmLanguage.json"
+	},
+	"contributes": {
+		"languages": [{
+			"id": "shellscript",
+			"aliases": ["Shell Script", "shellscript", "bash", "sh", "zsh", "ksh", "csh"],
+			"extensions": [
+				".sh",
+				".bash",
+				".bashrc",
+				".bash_aliases",
+				".bash_profile",
+				".bash_login",
+				".ebuild",
+				".install",
+				".profile",
+				".bash_logout",
+				".zsh",
+				".zshrc",
+				".zprofile",
+				".zlogin",
+				".zlogout",
+				".zshenv",
+				".zsh-theme",
+				".ksh",
+				".csh",
+				".cshrc",
+				".tcshrc",
+				".yashrc",
+				".yash_profile"
+			],
+			"filenames": [
+				"APKBUILD",
+				"PKGBUILD",
+				".envrc",
+				".hushlogin",
+				"zshrc",
+				"zshenv",
+				"zlogin",
+				"zprofile",
+				"zlogout",
+				"bashrc_Apple_Terminal",
+				"zshrc_Apple_Terminal"
+			],
+			"firstLine": "^#!.*\\b(bash|zsh|sh|ksh|dtksh|pdksh|mksh|ash|dash|yash|sh|csh|jcsh|tcsh|itcsh).*|^#\\s*-\\*-[^*]*mode:\\s*shell-script[^*]*-\\*-",
+			"configuration": "./language-configuration.json",
+			"mimetypes": ["text/x-shellscript"]
+		}],
+		"grammars": [{
+			"language": "shellscript",
+			"scopeName": "source.shell",
+			"path": "./syntaxes/shell-unix-bash.tmLanguage.json"
+		}],
+		"configurationDefaults": {
+			"[shellscript]": {
+				"files.eol": "\n"
+			}
+		}
+
+	}
+}

lib/vscode/extensions/shellscript/package.nls.json

@@ -0,0 +1,4 @@
+{
+	"displayName": "Shell Script Language Basics",
+	"description": "Provides syntax highlighting and bracket matching in Shell Script files."
+}

lib/vscode/extensions/shellscript/test/colorize-fixtures/test.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+	realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
+	ROOT=$(dirname $(dirname $(realpath "$0")))
+else
+	ROOT=$(dirname $(dirname $(readlink -f $0)))
+fi
+
+DEVELOPER=$(xcode-select -print-path)
+LIPO=$(xcrun -sdk iphoneos -find lipo)
+
+function code() {
+	cd $ROOT
+
+	# Node modules
+	test -d node_modules || ./scripts/npm.sh install
+
+	# Configuration
+	export NODE_ENV=development
+
+	# Launch Code
+	if [[ "$OSTYPE" == "darwin"* ]]; then
+		exec ./.build/electron/Electron.app/Contents/MacOS/Electron . "$@"
+	else
+		exec ./.build/electron/electron . "$@"
+	fi
+}
+
+code "$@"