Merge branch 'master' into non-root

package.json

@@ -71,6 +71,16 @@
         "language": "hack",
         "scopeName": "source.hack",
         "path": "./syntaxes/hack.json"
+      },
+      {
+        "scopeName": "markdown.hack.codeblock",
+        "path": "./syntaxes/codeblock.json",
+        "injectTo": [
+          "text.html.markdown"
+        ],
+        "embeddedLanguages": {
+          "meta.embedded.block.hack": "hack"
+        }
       }
     ],
     "snippets": [

syntaxes/codeblock.json

@@ -0,0 +1,22 @@
+{
+  "fileTypes": [],
+  "injectionSelector": "L:markup.fenced_code.block.markdown",
+  "patterns": [
+    {
+      "include": "#hack-code-block"
+    }
+  ],
+  "repository": {
+    "hack-code-block": {
+      "begin": "hack",
+      "end": "(^|\\G)(?=\\s*[`~]{3,}\\s*$)",
+      "contentName": "meta.embedded.block.hack",
+      "patterns": [
+        {
+          "include": "source.hack"
+        }
+      ]
+    }
+  },
+  "scopeName": "markdown.hack.codeblock"
+}

syntaxes/test/README.md

@@ -5,3 +5,10 @@ This folder contains interesting examples of hack code that can be used to demon
 To report a bug for syntax highlighting, please submit a file that demonstrates a snippet of code that is colored incorrectly.
 
 To test updates to syntax coloring, open this folder and verify the examples.
+
+```hack
+// This embedded code block within the markdown should also be properly highlighted in the manner of a hack file.
+function f() {
+  return;
+}
+```