Merge pull request #998 from y-lohse/fix/incorrect-substring

Add failing tests to prove #997 Fix incorrect substring in TrySplittingHeadTailWhitespace

package.json

@@ -1,6 +1,6 @@
 {
   "name": "inkjs",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "A javascript port of inkle's ink scripting language (http://www.inklestudios.com/ink/)",
   "main": "dist/ink-full.js",
   "types": "ink.d.ts",

src/engine/StoryState.ts

@@ -815,10 +815,7 @@ export class StoryState {
     }
 
     if (innerStrEnd > innerStrStart) {
-      let innerStrText = str.substring(
-        innerStrStart,
-        innerStrEnd - innerStrStart
-      );
+      let innerStrText = str.substring(innerStrStart, innerStrEnd);
       listTexts.push(new StringValue(innerStrText));
     }
 
@@ -827,7 +824,10 @@ export class StoryState {
       if (tailLastNewlineIdx < str.length - 1) {
         let numSpaces = str.length - tailLastNewlineIdx - 1;
         let trailingSpaces = new StringValue(
-          str.substring(tailLastNewlineIdx + 1, numSpaces)
+          str.substring(
+            tailLastNewlineIdx + 1,
+            tailLastNewlineIdx + 1 + numSpaces
+          )
         );
         listTexts.push(trailingSpaces);
       }

src/tests/inkfiles/original/inkjs/tests.ink

@@ -427,6 +427,10 @@ mutated 1
 mutated 2
 -> DONE
 
+= variable_print
+{stringvar}
+-> DONE
+
 = visit_count
 visited
 -> DONE

src/tests/specs/inkjs/engine/Integration.spec.ts

@@ -51,6 +51,21 @@ describe("Integration", () => {
     expect(context.story.variablesState["stringvar"]).toEqual("Jonas");
   });
 
+  it("should correctly print variables passed to ink, part 1", () => {
+    context.story.variablesState["stringvar"] = "\n\nDear Emilia";
+    context.story.ChoosePathString("integration.variable_print");
+    expect(context.story.Continue()).toEqual("Dear Emilia\n");
+  });
+
+  it("should correctly print variables passed to ink, part 2", () => {
+    context.story.variablesState["stringvar"] =
+      "\n\nDear Emilia, \nHope you are well\n\n      ";
+    context.story.ChoosePathString("integration.variable_print");
+    expect(context.story.Continue()).toEqual(
+      "Dear Emilia,\nHope you are well\n"
+    );
+  });
+
   it("should observe variables", () => {
     context.story.ChoosePathString("integration.variable_observer");
     expect(context.story.variablesState["observedVar1"]).toEqual(1);