Merge VS Code 1.23.1 (#1520)

extensions/powershell/language-configuration.json

@@ -14,7 +14,6 @@
 		["(", ")"],
 		{ "open": "\"", "close": "\"", "notIn": ["string"]},
 		{ "open": "'", "close": "'", "notIn": ["string", "comment"]},
-		["/**", " */"],
 		["<#", "#>"]
 	],
 	"surroundingPairs": [

extensions/powershell/package.json

@@ -10,6 +10,7 @@
 			"id": "powershell",
 			"extensions": [ ".ps1", ".psm1", ".psd1", ".pssc", ".psrc" ],
 			"aliases": [ "PowerShell", "powershell", "ps", "ps1" ],
+			"firstLine": "^#!/.*\\bpwsh\\b",
 			"configuration": "./language-configuration.json"
 		}],
 		"grammars": [{
@@ -25,4 +26,4 @@
 	"scripts": {
 		"update-grammar": "node ../../build/npm/update-grammar.js PowerShell/EditorSyntax PowerShellSyntax.tmLanguage ./syntaxes/powershell.tmLanguage.json"
 	}
-}
+}