Fix source-extracting scripts to ignore on ids in front of code

marijnh · marijnh · commit b6d5ec2f8d9c · 2014-07-24T08:46:55.000+02:00
diff --git a/bin/build_code.js b/bin/build_code.js
@@ -3,7 +3,7 @@ var fs = require("fs");
 var file = process.argv[2];
 var input = fs.readFileSync(file, "utf8");
 
-var included = /\/\/ include_code(.*)\n(?:\/\/.*\n)*\s*(?:\[sandbox=.*\n)?\[source,.*?\]\n----\n([\s\S]*?\n)----/g, m;
+var included = /\/\/ include_code(.*)\n(?:\/\/.*\n)*\s*(?:\[sandbox=.*\n|\[\[.*\n)*\[source,.*?\]\n----\n([\s\S]*?\n)----/g, m;
 var files = Object.create(null);
 var defaultFile = "code/chapter/" + file.replace(".txt", ".js");
 
diff --git a/bin/run_tests.js b/bin/run_tests.js
@@ -39,7 +39,7 @@ function pos(index) {
 
 var sandboxes = {}, anonId = 0;
 
-var re = /((?:\/\/.*\n|\s)*)(?:\[sandbox="([^"]*)"\]\n)?\[source,([^\]]+)\]\n----\n([\s\S]*?\n)----/g, m;
+var re = /((?:\/\/.*\n|\s)*)(?:\[sandbox="([^"]*)"\]\n|\[\[.*\n)*\[source,([^\]]+)\]\n----\n([\s\S]*?\n)----/g, m;
 while (m = re.exec(input)) {
   var snippet = m[4], hasConf = m[1].match(/\/\/ test: (.*)/);
   var sandbox = m[2] || "null", type = m[3], config = hasConf ? hasConf[1] : "";
