Commit9cbf8f8

committed

refactor loader regex patterns for different programming languages

1 parent6fde3ad commit9cbf8f8Copy full SHA for 9cbf8f8

File tree

+24

-26

lines changed

+24

-26

lines changed

Lines changed: 11 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,25 +1,24 @@`
`1`	`1`	`"use strict";`
`2`	`2`	`varpath=require('path');`
`3`	`3`	`varfs=require('fs');`
`4`		`-varsupportedFileTypes=['js','jsx','ts','py'];`
`5`		-varjs=/^\/\/\s?load$['"`](.+)['"`](\,\s?true)?$/m;
`6`		`-varloaderMatch={`
`7`		`-js:js,`
`8`		`-ts:js,`
`9`		`-jsx:js,`
`10`		-py:/^#\s?load$['"`](.+)['"`](,\s?true)?$/m
	`4`	`+varcomments={`
	`5`	`+py:'#'`
`11`	`6`	`};`
`12`		`-functionparseLoaders(data,fileType){`
`13`		`-if(supportedFileTypes.indexOf(fileType)<0){`
`14`		`-console.log("File type \""+fileType+"\" not supported.");`
`15`		`-return'';`
	`7`	`+functionloaderRegex(fileType){`
	`8`	`+varcomment='\/{2,3}';`
	`9`	`+if(comments[fileType]){`
	`10`	`+comment=comments[fileType];`
`16`	`11`	`}`
	`12`	`+returnnewRegExp("^"+comment+" ?load\$['\"](.+)['\"](,s?true)?\$",'m');`
	`13`	`+}`
	`14`	`+functionparseLoaders(data,fileType){`
`17`	`15`	`vari=-1;`
`18`	`16`	`varlines=data.split('\n');`
`19`	`17`	`varfilesLoaded=[];`
	`18`	`+varloaderMatch=loaderRegex(fileType);`
`20`	`19`	`while(i<lines.length-1){`
`21`	`20`	`i+=1;`
`22`		`-varloader=lines[i].match(loaderMatch[fileType]);`
	`21`	`+varloader=lines[i].match(loaderMatch);`
`23`	`22`	`if(loader){`
`24`	`23`	`varfileToLoad=loader[1];`
`25`	`24`	`if(filesLoaded.indexOf(fileToLoad)>-1){`

Lines changed: 13 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,31 +1,31 @@`
`1`	`1`	`import*aspathfrom'path';`
`2`	`2`	`import*asfsfrom'fs';`
`3`	`3`
`4`		`-constsupportedFileTypes=['js','jsx','ts','py'];`
`5`		-constjs=/^\/\/\s?load$['"`](.+)['"`](\,\s?true)?$/m;// // load('file'),
`6`		`-constloaderMatch={`
`7`		`- js,`
`8`		`-ts:js,`
`9`		`-jsx:js,`
`10`		-py:/^#\s?load$['"`](.+)['"`](,\s?true)?$/m// # load('file')
	`4`	`+// other languages may handle comments differently`
	`5`	`+constcomments={`
	`6`	`+py:'#'`
`11`	`7`	`};`
`12`	`8`
`13`		`-exportdefaultfunctionparseLoaders(data:string,fileType:string){`
`14`		`-`
`15`		`-if(supportedFileTypes.indexOf(fileType)<0){`
`16`		-console.log(`File type "${fileType}" not supported.`);
`17`		`-return'';`
	`9`	`+functionloaderRegex(fileType:string){`
	`10`	`+letcomment='\/{2,3}';`
	`11`	`+if(comments[fileType]){`
	`12`	`+comment=comments[fileType];`
`18`	`13`	`}`
	`14`	+returnnewRegExp(`^${comment} ?load\$['"](.+)['"](\,\s?true)?\$`,'m');
	`15`	`+}`
	`16`	`+`
	`17`	`+exportdefaultfunctionparseLoaders(data:string,fileType:string){`
`19`	`18`
`20`	`19`	`// loop over lines and add editor files`
`21`	`20`	`leti=-1;`
`22`	`21`	`letlines=data.split('\n');`
`23`	`22`
`24`	`23`	`letfilesLoaded=[];`
	`24`	`+letloaderMatch=loaderRegex(fileType);`
`25`	`25`
`26`	`26`	`while(i<lines.length-1){`
`27`	`27`	`i+=1;`
`28`		`-letloader:string[]=lines[i].match(loaderMatch[fileType]);`
	`28`	`+letloader:string[]=lines[i].match(loaderMatch);`
`29`	`29`
`30`	`30`	`if(loader){`
`31`	`31`	`// loader found`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`import*aspathfrom'path';`
`2`	`2`	`import*asfsfrom'fs';`
`3`	`3`	`import*asTypefrom'../../actions/actionTypes';`
`4`		`-importconcatTestsfrom'./concat-tests';`
`5`	`4`
`6`	`5`	`exportdefaultfunctiontaskTestsReducer(taskTests='',action:CR.Action):string{`
`7`	`6`	`switch(action.type){`

Comments

(0)