handle codeblock languages in build

ShMcK · ShMcK · commit c50d3916380d · 2016-02-11T08:36:53.000-08:00
diff --git a/cli.js b/cli.js
@@ -1,5 +1,4 @@
 #! /usr/bin/env node
-
 "use strict";
 var program = require('commander');
 var chalk = require('chalk');
@@ -10,7 +9,7 @@ var tutorials_1 = require('./src/tutorials/tutorials');
 var publish_1 = require('./src/publish/publish');
 var docs_1 = require('./src/docs/docs');
 program
-    .version('0.3.9')
+    .version('0.3.10')
     .usage('[options] <keywords>')
     .option('-b, --build [path/to/tutorial.md]', 'tutorial markdown file', /^.+\.md$/i)
     .option('-c, --create [name]', 'tutorial name')
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coderoad-cli",
-  "version": "0.3.9",
+  "version": "0.3.10",
   "description": "Command line interface for CodeRoad. Build project files.",
   "keywords": [
     "coderoad"
diff --git a/src/build/parser/page.js b/src/build/parser/page.js
@@ -21,6 +21,10 @@ function page(result, lines, index) {
         }
         else {
             if (!!Match.codeBlock(line)) {
+                if (line.length > 3) {
+                    result = addToDescriptionOrExplanation(hasBreak, i, result, line, index);
+                    continue;
+                }
                 inCodeBlock = !inCodeBlock;
             }
             if (!inCodeBlock) {
@@ -40,28 +44,32 @@ function page(result, lines, index) {
                     return task_1.task(result, lines.slice(i), index);
                 }
                 else {
-                    if (!hasBreak) {
-                        if (result.chapters[index.chapter].pages[index.page].description === undefined) {
-                            result.chapters[index.chapter].pages[index.page].description = '';
-                        }
-                        if (i > 1) {
-                            result.chapters[index.chapter].pages[index.page].description += '\n';
-                        }
-                        result.chapters[index.chapter].pages[index.page].description += line;
-                    }
-                    else {
-                        if (result.chapters[index.chapter].pages[index.page].explanation === undefined) {
-                            result.chapters[index.chapter].pages[index.page].explanation = '';
-                        }
-                        if (i > 3) {
-                            result.chapters[index.chapter].pages[index.page].explanation += '\n';
-                        }
-                        result.chapters[index.chapter].pages[index.page].explanation += line;
-                    }
+                    result = addToDescriptionOrExplanation(hasBreak, i, result, line, index);
                 }
             }
         }
     }
     return result;
 }
 exports.page = page;
+function addToDescriptionOrExplanation(hasBreak, i, result, line, index) {
+    if (!hasBreak) {
+        if (result.chapters[index.chapter].pages[index.page].description === undefined) {
+            result.chapters[index.chapter].pages[index.page].description = '';
+        }
+        if (i > 1) {
+            result.chapters[index.chapter].pages[index.page].description += '\n';
+        }
+        result.chapters[index.chapter].pages[index.page].description += line;
+    }
+    else {
+        if (result.chapters[index.chapter].pages[index.page].explanation === undefined) {
+            result.chapters[index.chapter].pages[index.page].explanation = '';
+        }
+        if (i > 3) {
+            result.chapters[index.chapter].pages[index.page].explanation += '\n';
+        }
+        result.chapters[index.chapter].pages[index.page].explanation += line;
+    }
+    return result;
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "coderoad-cli",`
`3`		`- "version": "0.3.9",`
	`3`	`+ "version": "0.3.10",`
`4`	`4`	`"description": "Command line interface for CodeRoad. Build project files.",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"coderoad"`