Commit3d461a1

committed

ensure brackets are matched

1 parentabcf341 commit3d461a1Copy full SHA for 3d461a1

File tree

+14

-7

lines changed

+14

-7

lines changed

Lines changed: 13 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ const parse = (input, options = {}) => {`
`43`	`43`	`letstack=[ast];`
`44`	`44`	`letblock=ast;`
`45`	`45`	`letprev=ast;`
	`46`	`+letbrackets=0;`
`46`	`47`	`letlength=input.length;`
`47`	`48`	`letindex=0;`
`48`	`49`	`letdepth=0;`
`@@ -108,25 +109,31 @@ const parse = (input, options = {}) => {`
`108`	`109`	`*/`
`109`	`110`
`110`	`111`	`if(value===CHAR_LEFT_SQUARE_BRACKET){`
	`112`	`+brackets++;`
	`113`	`+`
`111`	`114`	`letclosed=true;`
`112`	`115`	`letnext;`
`113`	`116`
`114`	`117`	`while(index<length&&(next=advance())){`
`115`	`118`	`value+=next;`
`116`	`119`
	`120`	`+if(next===CHAR_LEFT_SQUARE_BRACKET){`
	`121`	`+brackets++;`
	`122`	`+continue;`
	`123`	`+}`
	`124`	`+`
`117`	`125`	`if(next===CHAR_BACKSLASH){`
`118`	`126`	`value+=advance();`
`119`	`127`	`continue;`
`120`	`128`	`}`
`121`	`129`
`122`	`130`	`if(next===CHAR_RIGHT_SQUARE_BRACKET){`
`123`		`-closed=true;`
`124`		`-break;`
`125`		`-}`
`126`		`-}`
	`131`	`+brackets--;`
`127`	`132`
`128`		`-if(closed!==true){`
`129`		`-value='\\'+value;`
	`133`	`+if(brackets===0){`
	`134`	`+break;`
	`135`	`+}`
	`136`	`+}`
`130`	`137`	`}`
`131`	`138`
`132`	`139`	`push({type:'text', value});`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ describe('bash tests', () => {`
`289`	`289`	`equal('a/*/c/{d,e}/f.{md,txt}',['a/*/c/d/f.md','a/*/c/d/f.txt','a/*/c/e/f.md','a/*/c/e/f.txt']);`
`290`	`290`	`});`
`291`	`291`
`292`		`-it('should expand withextglobs.',()=>{`
	`292`	`+it('should expand withbrackets.',()=>{`
`293`	`293`	`equal('a/b/{d,e,[1-5]}/.js',['a/b/d/.js','a/b/e/.js','a/b/[1-5]/.js']);`
`294`	`294`	`});`
`295`	`295`	`});`

Comments

(0)