Merge VS Code 1.23.1 (#1520)

extensions/yaml/language-configuration.json

@@ -22,7 +22,11 @@
 		["'", "'"]
 	],
 	"folding": {
-		"offSide": true
+		"offSide": true,
+		"markers": {
+			"start": "^\\s*#\\s*region\\b",
+			"end": "^\\s*#\\s*endregion\\b"
+		}
 	},
 	"indentationRules": {
 		"increaseIndentPattern": "^\\s*.*(:|-) ?(&\\w+)?(\\{[^}\"']*|\\([^)\"']*)?$",

extensions/yaml/package.json

@@ -19,10 +19,10 @@
 					"yaml"
 				],
 				"extensions": [
+					".yml",
 					".eyaml",
 					".eyml",
-					".yaml",
-					".yml"
+					".yaml"
 				],
 				"filenames": [
 					"yarn.lock"