Commitd123ec3

committed

load parser fixes

1 parent9cbf8f8 commitd123ec3Copy full SHA for d123ec3

File tree

+18

-5

lines changed

+18

-5

lines changed

Lines changed: 9 additions & 2 deletions

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`		`-returnnewRegExp("^"+comment+" ?load\$['\"](.+)['\"](,s?true)?\$",'m');`
	`12`	`+returnnewRegExp("^"+comment+" ?load\$['\"](.+)['\"](,?true)?\$",'m');`
`13`	`13`	`}`
`14`	`14`	`functionparseLoaders(data,fileType){`
`15`	`15`	`vari=-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`	`+varmessage='File not found: '+pathToFile;`
	`40`	`+lines[i]=message;`
	`41`	`+console.log(message);`
	`42`	`+}`
`36`	`43`	`}`
`37`	`44`	`}`
`38`	`45`	`returnlines.join('\n');`

Lines changed: 1 addition & 1 deletion

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": [`

Lines changed: 8 additions & 2 deletions

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`		-returnnewRegExp(`^${comment} ?load\$['"](.+)['"](\,\s?true)?\$`,'m');
	`14`	+returnnewRegExp(`^${comment} ?load\$['"](.+)['"](\,?true)?\$`,'m');
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`exportdefaultfunctionparseLoaders(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`	`+letmessage='File not found: '+pathToFile;`
	`52`	`+lines[i]=message;`
	`53`	`+console.log(message);`
	`54`	`+}`
`49`	`55`	`}`
`50`	`56`	`}`
`51`	`57`	`returnlines.join('\n');`

Comments

(0)