Merge pull request #123 from moormaster/fix-fail-if-line-matches-inco…

…mpletely-that-should-not-match-at-all fix: make challenge fail when lines match incompletely but should not match at all
CoderDojoPotsdam · May 2, 2024 · d045118 · d045118
2 parents ca83c21 + 21faa6c
commit d045118
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/_layouts/tutorial.html b/_layouts/tutorial.html
@@ -39,6 +39,10 @@
       content: "{{ site.data.localization.match.matchedIncompletely[page.lang] }}";
     }
 
+    .playfield.verbose .incompletematch.fail:after {
+      content: "{{ site.data.localization.match.shouldNotMatch[page.lang] }}";
+    }
+
     .playfield.verbose .match.ok:after {
       content: "{{ site.data.localization.match.matched[page.lang] }}";
     }

diff --git a/css/playfield.css b/css/playfield.css
@@ -54,6 +54,9 @@
 .playfield  .incompletematch.ok {
   background-color: {{ site.data.colors.fails }};
 }
+.playfield  .incompletematch.fail {
+  background-color: {{ site.data.colors.fails }};
+}
 .playfield  .nomatch.ok {
   background-color: {{ site.data.colors.fails }};
 }

diff --git a/js/playfield.js b/js/playfield.js
@@ -119,8 +119,9 @@ function watchExpression(playfield, examples, regex, message) {
 
         matchExample(match, isIncomplete, text, example);
 
-        // enforce overall result to fail if any match is incomplete
-        match = !isIncomplete;
+        // enforce overall result to fail if any expected match is incomplete
+        if (referenceInfo.shouldMatchWholeLine && !shouldNotMatch)
+          match = match && !isIncomplete;
       } else {
         unmatchExample(example);
       }