Commit d045118

authored

Merge pull request #123 from moormaster/fix-fail-if-line-matches-incompletely-that-should-not-match-at-all

fix: make challenge fail when lines match incompletely but should not match at all

2 parents ca83c21 + 21faa6c commit d045118Copy full SHA for d045118

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,10 @@`
`39`	`39`	`content: "{{ site.data.localization.match.matchedIncompletely[page.lang] }}";`
`40`	`40`	`}`
`41`	`41`
	`42`	`+ .playfield.verbose .incompletematch.fail:after {`
	`43`	`+ content: "{{ site.data.localization.match.shouldNotMatch[page.lang] }}";`
	`44`	`+ }`
	`45`	`+`
`42`	`46`	`.playfield.verbose .match.ok:after {`
`43`	`47`	`content: "{{ site.data.localization.match.matched[page.lang] }}";`
`44`	`48`	`}`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,9 @@`
`54`	`54`	`.playfield .incompletematch.ok {`
`55`	`55`	`background-color: {{ site.data.colors.fails }};`
`56`	`56`	`}`
	`57`	`+.playfield .incompletematch.fail {`
	`58`	`+ background-color: {{ site.data.colors.fails }};`
	`59`	`+}`
`57`	`60`	`.playfield .nomatch.ok {`
`58`	`61`	`background-color: {{ site.data.colors.fails }};`
`59`	`62`	`}`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -119,8 +119,9 @@ function watchExpression(playfield, examples, regex, message) {`
`119`	`119`
`120`	`120`	`matchExample(match, isIncomplete, text, example);`
`121`	`121`
`122`		`- // enforce overall result to fail if any match is incomplete`
`123`		`- match = !isIncomplete;`
	`122`	`+ // enforce overall result to fail if any expected match is incomplete`
	`123`	`+ if (referenceInfo.shouldMatchWholeLine && !shouldNotMatch)`
	`124`	`+ match = match && !isIncomplete;`
`124`	`125`	`} else {`
`125`	`126`	`unmatchExample(example);`
`126`	`127`	`}`

Comments

(0)