♻️ Refactor getting settings from code

Author: zihan21206

runestone/hparsons/js/SQLFeedback.js

@@ -247,7 +247,7 @@ export default class SQLFeedback extends HParsonsFeedback {
         }
 
         // Now handle autograding
-        if (this.hparsons.suffix) {
+        if (this.hparsons.unittest) {
             this.testResult = this.autograde(
                 this.results[this.results.length - 1]
             );
@@ -291,7 +291,7 @@ export default class SQLFeedback extends HParsonsFeedback {
 
     // might move to base class if used by multiple execution based feedback
     autograde(result_table) {
-        var tests = this.hparsons.suffix.split(/\n/);
+        var tests = this.hparsons.unittest.split(/\n/);
         this.passed = 0;
         this.failed = 0;
         // Tests should be of the form

runestone/hparsons/js/hparsons.js

@@ -14,8 +14,6 @@ if (hpList === undefined) hpList = {};
 export default class HParsons extends RunestoneBase {
     constructor(opts) {
         super(opts);
-        // copied from activecode
-        var suffStart;
         // getting settings
         var orig = $(opts.orig).find("textarea")[0];
         this.reuse = $(orig).data("reuse") ? true : false;
@@ -37,16 +35,7 @@ export default class HParsons extends RunestoneBase {
         this.loadButton = null;
         this.outerDiv = null;
         this.controlDiv = null;
-        let prefixEnd = this.code.indexOf("^^^^");
-        if (prefixEnd > -1) {
-            this.prefix = this.code.substring(0, prefixEnd);
-            this.code = this.code.substring(prefixEnd + 5);
-        }
-        suffStart = this.code.indexOf("--unittest--");
-        if (suffStart > -1) {
-            this.suffix = this.code.substring(suffStart + 5);
-            this.code = this.code.substring(0, suffStart);
-        }
+        this.processContent(this.code)
 
         // Change to factory when more execution based feedback is included
         if (this.isBlockGrading) {
@@ -73,6 +62,26 @@ export default class HParsons extends RunestoneBase {
         this.feedbackController.init();
     }
 
+    processContent(code) {
+        // todo: add errors when blocks are nonexistent (maybe in python)?
+        this.originalBlocks = this.processSingleContent(code, '--blocks--').split('\n').slice(1,-1);
+        this.unittest = this.processSingleContent(code, '--unittest--');
+    }
+
+    processSingleContent(code, delimitier) {
+        let index = code.indexOf(delimitier);
+        if (index > -1) {
+            let content = code.substring(index + delimitier.length);
+            let endIndex = content.indexOf("\n--");
+            content =
+                endIndex > -1
+                    ? content.substring(0, endIndex + 1)
+                    : content;
+            return content;
+        }
+        return undefined;
+    }
+
     // copied from activecode, already modified to add parsons
     createEditor() {
         this.outerDiv = document.createElement("div");
@@ -82,24 +91,12 @@ export default class HParsons extends RunestoneBase {
             this.logHorizontalParsonsEvent(ev.detail);
             this.feedbackController.clearFeedback();
         });
-        let blocks = [];
-        let blockIndex = this.code.indexOf("--blocks--");
-        if (blockIndex > -1) {
-            let blocksString = this.code.substring(blockIndex + 10);
-            let endIndex = blocksString.indexOf("\n--");
-            blocksString =
-                endIndex > -1
-                    ? blocksString.substring(0, endIndex)
-                    : blocksString;
-            blocks = blocksString.split("\n");
-        }
-        this.originalBlocks = blocks.slice(1, -1);
         const props = {
             selector: `#${this.divid}-container`,
             id: `${this.divid}-hparsons`,
             reuse: this.reuse,
             randomize: this.randomize,
-            parsonsBlocks: blocks.slice(1, -1),
+            parsonsBlocks: [...this.originalBlocks],
             language: this.language
         }
         InitMicroParsons(props);