Merge branch 'Parson_indentation_fix' of https://github.com/ascholerChemeketa/RunestoneComponents into ascholerChemeketa-Parson_indentation_fix

Author: bnmnetp

runestone/parsons/js/dagGrader.js

@@ -92,6 +92,31 @@ export default class DAGGrader extends LineBasedGrader {
     return indices;
   }
 
+  checkCorrectIndentation(solutionLines, answerLines) {
+      this.indentLeft = [];
+      this.indentRight = [];
+
+      let indentationByTag = {};
+      for (let i = 0; i < solutionLines.length; i++) {
+        const line = solutionLines[i];
+        indentationByTag[line.tag] = line.indent;
+      }
+
+      let loopLimit = Math.min(solutionLines.length, answerLines.length);
+      for (let i = 0; i < loopLimit; i++) {
+          let solutionIndent = indentationByTag[answerLines[i].tag];
+          if (answerLines[i].viewIndent() < solutionIndent) {
+              this.indentRight.push(answerLines[i]);
+          } else if (answerLines[i].viewIndent() > solutionIndent) {
+              this.indentLeft.push(answerLines[i]);
+          }
+      }
+      this.incorrectIndents =
+          this.indentLeft.length + this.indentRight.length;
+
+      return this.incorrectIndents == 0;
+  }
+
   checkCorrectOrdering(solutionLines, answerLines) {
     if (!isDirectedAcyclicGraph(graphToNX(solutionLines))) {
       throw "Dependency between blocks does not form a Directed Acyclic Graph; Problem unsolvable.";

runestone/parsons/js/lineGrader.js

@@ -75,20 +75,10 @@ export default class LineBasedGrader {
         let isCorrectOrder = this.checkCorrectOrdering(solutionLines, answerLines)
 
         // Determine whether blocks are indented correctly
-        this.indentLeft = [];
-        this.indentRight = [];
-        let loopLimit = Math.min(solutionLines.length, answerLines.length);
-        for (i = 0; i < loopLimit; i++) {
-            if (answerLines[i].viewIndent() < solutionLines[i].indent) {
-                this.indentRight.push(answerLines[i]);
-            } else if (answerLines[i].viewIndent() > solutionLines[i].indent) {
-                this.indentLeft.push(answerLines[i]);
-            }
-        }
-        this.incorrectIndents =
-            this.indentLeft.length + this.indentRight.length;
+        let isCorrectIndents = this.checkCorrectIndentation(solutionLines, answerLines);
+
         if (
-            this.incorrectIndents == 0 &&
+            isCorrectIndents &&
             isCorrectOrder &&
             this.correctLength
         ) {
@@ -105,6 +95,23 @@ export default class LineBasedGrader {
         return state;
     }
 
+    checkCorrectIndentation(solutionLines, answerLines) {
+        this.indentLeft = [];
+        this.indentRight = [];
+        let loopLimit = Math.min(solutionLines.length, answerLines.length);
+        for (let i = 0; i < loopLimit; i++) {
+            if (answerLines[i].viewIndent() < answerLines[i].indent) {
+                this.indentRight.push(answerLines[i]);
+            } else if (answerLines[i].viewIndent() > solutionLines[i].indent) {
+                this.indentLeft.push(answerLines[i]);
+            }
+        }
+        this.incorrectIndents =
+            this.indentLeft.length + this.indentRight.length;
+
+        return this.incorrectIndents == 0;
+    }
+
     checkCorrectOrdering(solutionLines, answerLines) {
         let isCorrectOrder = true;
         this.correctLines = 0;

runestone/parsons/js/parsons.js

@@ -309,7 +309,12 @@ export default class Parsons extends RunestoneBase {
                     s.replace(/\s+/g, "")
                 ); // remove whitespace in tag and depends list
                 tagIndex = textBlock.indexOf("#tag:");
-                tag = textBlock.substring(tagIndex + 5, tagIndex + 6);
+                tag = textBlock.substring(
+                    tagIndex + 5,
+                    textBlock.indexOf(";", tagIndex + 5)
+                );
+                if (tag == "")
+                    tag = "block-" + i;
                 dependsIndex = textBlock.indexOf(";depends:");
                 let dependsString = textBlock.substring(
                     dependsIndex + 9,

runestone/parsons/test/_sources/index.rst

@@ -147,3 +147,34 @@ Proof Blocks
   $c'(u) \ne c'(v)$ #tag:7;depends:6,3;
   =====
   $c'$ is a 2-coloring of $H$, so $H$ is 2-colorable. (end of proof) #tag:8;depends:7;
+
+============
+Code DAG
+============
+
+.. parsonsprob:: test_parsons_dag_indent
+   :grader: dag
+
+   Test that indentation works with dag
+
+   .. code-block:: python
+
+      def foo:
+         if True:
+            return 2
+      def bar:
+         return 40
+      print(foo() + bar())
+
+   -----
+   def foo(): #tag:foo;depends:;
+   =====
+      if True: #tag:foo_if; depends:foo;
+   =====
+         return 2 #tag:f1; depends:foo_if;
+   =====
+   def bar(): #tag:bar;depends:;
+   =====
+      return 40 #tag:b1; depends:bar;
+   =====
+   print(foo() + bar()) #tag:asdf; depends: f1,b1;