load parser fixes

ShMcK · ShMcK · commit d123ec3ab3f4 · 2016-04-01T16:21:16.000-07:00
diff --git a/lib/reducers/run-tests/parse-loaders.js b/lib/reducers/run-tests/parse-loaders.js
@@ -9,7 +9,7 @@ function loaderRegex(fileType) {
     if (comments[fileType]) {
         comment = comments[fileType];
     }
-    return new RegExp("^" + comment + " ?load\\(['\"](.+)['\"](,s?true)?\\)", 'm');
+    return new RegExp("^" + comment + " ?load\\(['\"](.+)['\"](, ?true)?\\)", 'm');
 }
 function parseLoaders(data, fileType) {
     var i = -1;
@@ -32,7 +32,14 @@ function parseLoaders(data, fileType) {
             else {
                 pathToFile = path.normalize(path.join(window.coderoad.dir, fileToLoad));
             }
-            lines[i] = fs.readFileSync(pathToFile, 'utf8');
+            try {
+                lines[i] = fs.readFileSync(pathToFile, 'utf8');
+            }
+            catch (e) {
+                var message = 'File not found: ' + pathToFile;
+                lines[i] = message;
+                console.log(message);
+            }
         }
     }
     return lines.join('\n');
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "atom-coderoad",
   "main": "./lib/atom/main",
-  "version": "0.6.0",
+  "version": "0.5.5",
   "description": "Interactive tutorial plugin for Atom",
   "author": "Shawn McKay <shawn.j.mckay@gmail.com>",
   "keywords": [
diff --git a/src/reducers/run-tests/parse-loaders.ts b/src/reducers/run-tests/parse-loaders.ts
@@ -11,7 +11,7 @@ function loaderRegex(fileType: string) {
   if (comments[fileType]) {
     comment = comments[fileType];
   }
-  return new RegExp(`^${comment} ?load\\(['"](.+)['"](\,\s?true)?\\)`, 'm');
+  return new RegExp(`^${comment} ?load\\(['"](.+)['"](\, ?true)?\\)`, 'm');
 }
 
 export default function parseLoaders(data: string, fileType: string) {
@@ -45,7 +45,13 @@ export default function parseLoaders(data: string, fileType: string) {
         pathToFile = path.normalize(path.join(window.coderoad.dir, fileToLoad));
       }
 
-      lines[i] = fs.readFileSync(pathToFile, 'utf8');
+      try {
+        lines[i] = fs.readFileSync(pathToFile, 'utf8');
+      } catch (e) {
+        let message = 'File not found: ' + pathToFile;
+        lines[i] = message;
+        console.log(message);
+      }
     }
   }
   return lines.join('\n');

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ function loaderRegex(fileType) {`
`9`	`9`	`if (comments[fileType]) {`
`10`	`10`	`comment = comments[fileType];`
`11`	`11`	`}`
`12`		`- return new RegExp("^" + comment + " ?load\\(['\"](.+)['\"](,s?true)?\\)", 'm');`
	`12`	`+ return new RegExp("^" + comment + " ?load\\(['\"](.+)['\"](, ?true)?\\)", 'm');`
`13`	`13`	`}`
`14`	`14`	`function parseLoaders(data, fileType) {`
`15`	`15`	`var i = -1;`
`@@ -32,7 +32,14 @@ function parseLoaders(data, fileType) {`
`32`	`32`	`else {`
`33`	`33`	`pathToFile = path.normalize(path.join(window.coderoad.dir, fileToLoad));`
`34`	`34`	`}`
`35`		`- lines[i] = fs.readFileSync(pathToFile, 'utf8');`
	`35`	`+ try {`
	`36`	`+ lines[i] = fs.readFileSync(pathToFile, 'utf8');`
	`37`	`+ }`
	`38`	`+ catch (e) {`
	`39`	`+ var message = 'File not found: ' + pathToFile;`
	`40`	`+ lines[i] = message;`
	`41`	`+ console.log(message);`
	`42`	`+ }`
`36`	`43`	`}`
`37`	`44`	`}`
`38`	`45`	`return lines.join('\n');`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "atom-coderoad",`
`3`	`3`	`"main": "./lib/atom/main",`
`4`		`- "version": "0.6.0",`
	`4`	`+ "version": "0.5.5",`
`5`	`5`	`"description": "Interactive tutorial plugin for Atom",`
`6`	`6`	`"author": "Shawn McKay <shawn.j.mckay@gmail.com>",`
`7`	`7`	`"keywords": [`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ function loaderRegex(fileType: string) {`
`11`	`11`	`if (comments[fileType]) {`
`12`	`12`	`comment = comments[fileType];`
`13`	`13`	`}`
`14`		- return new RegExp(`^${comment} ?load\\(['"](.+)['"](\,\s?true)?\\)`, 'm');
	`14`	+ return new RegExp(`^${comment} ?load\\(['"](.+)['"](\, ?true)?\\)`, 'm');
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`export default function parseLoaders(data: string, fileType: string) {`
`@@ -45,7 +45,13 @@ export default function parseLoaders(data: string, fileType: string) {`
`45`	`45`	`pathToFile = path.normalize(path.join(window.coderoad.dir, fileToLoad));`
`46`	`46`	`}`
`47`	`47`
`48`		`- lines[i] = fs.readFileSync(pathToFile, 'utf8');`
	`48`	`+ try {`
	`49`	`+ lines[i] = fs.readFileSync(pathToFile, 'utf8');`
	`50`	`+ } catch (e) {`
	`51`	`+ let message = 'File not found: ' + pathToFile;`
	`52`	`+ lines[i] = message;`
	`53`	`+ console.log(message);`
	`54`	`+ }`
`49`	`55`	`}`
`50`	`56`	`}`
`51`	`57`	`return lines.join('\n');`