Merge from vscode 2e5312cd61ff99c570299ecc122c52584265eda2

extensions/powershell/language-configuration.json

@@ -12,6 +12,8 @@
 		["{", "}"],
 		["[", "]"],
 		["(", ")"],
+		{ "open": "@'", "close": "\n'@", "notIn": ["string", "comment"]},
+		{ "open": "@\"", "close": "\n\"@", "notIn": ["string", "comment"]},
 		{ "open": "\"", "close": "\"", "notIn": ["string"]},
 		{ "open": "'", "close": "'", "notIn": ["string", "comment"]},
 		["<#", "#>"]
@@ -29,4 +31,4 @@
 			"end": "^\\s*#[eE]nd[rR]egion\\b"
 		}
 	}
-}
+}

extensions/powershell/package.json

@@ -21,7 +21,7 @@
 		}],
 		"snippets": [{
 			"language": "powershell",
-			"path": "./snippets/powershell.json"
+			"path": "./snippets/powershell.code-snippets"
 		}]
 	},
 	"scripts": {