Merge branch 'FixMarkdownIssues' of git://github.com/rebornix/vscode into...

Merge branch 'FixMarkdownIssues' of git://github.com/rebornix/vscode into rebornix-FixMarkdownIssues

extensions/markdown/markdown.configuration.json

@@ -22,5 +22,19 @@
 			"(",
 			")"
 		]
+	],
+	"autoClosingPairs": [
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		]
 	]
 }
\ No newline at end of file

extensions/markdown/syntaxes/markdown.tmLanguage

@@ -82,6 +82,10 @@
 					<key>include</key>
 					<string>#fenced_code_block_ruby</string>
 				</dict>
+				<dict>
+					<key>include</key>
+					<string>#fenced_code_block_php</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#fenced_code_block_sql</string>
@@ -658,6 +662,22 @@
 						</dict>
 					</array>
 				</dict>
+				<key>fenced_code_block_php</key>
+				<dict>
+					<key>begin</key>
+					<string>(^|\G)\s*([`~]{3,})\s*(php|php3|php4|php5|phpt|phtml|aw|ctp)\s*$</string>
+					<key>name</key>
+					<string>markup.fenced_code.block.markdown</string>
+					<key>end</key>
+					<string>(^|\G)(\2)\n</string>
+					<key>patterns</key>
+					<array>
+						<dict>
+							<key>include</key>
+							<string>text.html.php</string>
+						</dict>
+					</array>
+				</dict>
 				<key>fenced_code_block_sql</key>
 				<dict>
 					<key>begin</key>