Merge VS Code 1.21 source code (#1067)

* Initial VS Code 1.21 file copy with patches

* A few more merges

* Post npm install

* Fix batch of build breaks

* Fix more build breaks

* Fix more build errors

* Fix more build breaks

* Runtime fixes 1

* Get connection dialog working with some todos

* Fix a few packaging issues

* Copy several node_modules to package build to fix loader issues

* Fix breaks from master

* A few more fixes

* Make tests pass

* First pass of license header updates

* Second pass of license header updates

* Fix restore dialog issues

* Remove add additional themes menu items

* fix select box issues where the list doesn't show up

* formatting

* Fix editor dispose issue

* Copy over node modules to correct location on all platforms

extensions/yaml/language-configuration.json

@@ -23,5 +23,9 @@
 	],
 	"folding": {
 		"offSide": true
+	},
+	"indentationRules": {
+		"increaseIndentPattern": "^\\s*.*(:|-) ?(&\\w+)?(\\{[^}\"']*|\\([^)\"']*)?$",
+		"decreaseIndentPattern": "^\\s+\\}$"
 	}
-}
+}

extensions/yaml/package.json

@@ -1,29 +1,48 @@
 {
 	"name": "yaml",
-	"version": "0.1.0",
+	"displayName": "%displayName%",
+	"description": "%description%",
+	"version": "1.0.0",
 	"publisher": "vscode",
-	"engines": { "vscode": "*" },
+	"engines": {
+		"vscode": "*"
+	},
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js textmate/yaml.tmbundle Syntaxes/YAML.tmLanguage ./syntaxes/yaml.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js textmate/yaml.tmbundle Syntaxes/YAML.tmLanguage ./syntaxes/yaml.tmLanguage.json"
 	},
 	"contributes": {
-		"languages": [{
-			"id": "yaml",
-			"aliases": ["YAML", "yaml"],
-			"extensions": [".eyaml", ".eyml", ".yaml", ".yml"],
-			"filenames": [ "yarn.lock" ],
-			"firstLine": "^#cloud-config",
-			"configuration": "./language-configuration.json"
-		}],
-		"grammars": [{
-			"language": "yaml",
-			"scopeName": "source.yaml",
-			"path": "./syntaxes/yaml.json"
-		}],
+		"languages": [
+			{
+				"id": "yaml",
+				"aliases": [
+					"YAML",
+					"yaml"
+				],
+				"extensions": [
+					".eyaml",
+					".eyml",
+					".yaml",
+					".yml"
+				],
+				"filenames": [
+					"yarn.lock"
+				],
+				"firstLine": "^#cloud-config",
+				"configuration": "./language-configuration.json"
+			}
+		],
+		"grammars": [
+			{
+				"language": "yaml",
+				"scopeName": "source.yaml",
+				"path": "./syntaxes/yaml.tmLanguage.json"
+			}
+		],
 		"configurationDefaults": {
 			"[yaml]": {
 				"editor.insertSpaces": true,
-				"editor.tabSize": 2
+				"editor.tabSize": 2,
+				"editor.autoIndent": false
 			}
 		}
 	}

extensions/yaml/package.nls.json

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

extensions/yaml/syntaxes/yaml.tmLanguage.json

@@ -5,19 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/textmate/yaml.tmbundle/commit/efc96efafe5e48480cf55a2ed124b388cbea4440",
-	"fileTypes": [
-		"yaml",
-		"yml",
-		"rviz",
-		"reek",
-		"clang-format",
-		"yaml-tmlanguage",
-		"syntax",
-		"sublime-syntax"
-	],
-	"firstLineMatch": "^%YAML( ?1.\\d+)?",
-	"keyEquivalent": "^~Y",
 	"name": "YAML",
+	"scopeName": "source.yaml",
 	"patterns": [
 		{
 			"include": "#comment"
@@ -628,7 +617,5 @@
 				}
 			]
 		}
-	},
-	"scopeName": "source.yaml",
-	"uuid": "686AD6AE-33F3-4493-9512-9E9FC1D5417F"
+	}
 }