Merge pull request #1060 from y-lohse/jz/reverse-dynamic-tags

Put dynamic tags in choice in correct order

package.json

@@ -1,6 +1,6 @@
 {
   "name": "inkjs",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "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/Story.ts

@@ -1230,7 +1230,7 @@ export class Story extends InkObject {
             this.state.PopFromOutputStream(outputCountConsumed);
             // Build string out of the content we collected
             let sb = new StringBuilder();
-            for (let strVal of contentStackForTag) {
+            for (let strVal of contentStackForTag.reverse()) {
               sb.Append(strVal.toString());
             }
             let choiceTag = new Tag(

src/tests/inkfiles/original/choices/dynamic_tags_in_choice.ink

@@ -0,0 +1,4 @@
+VAR var1 = "aaa"
+VAR var2 = "bbb"
+
++[choice #tag {var1}{var2}]

src/tests/specs/ink/Choices.spec.ts

@@ -278,4 +278,15 @@ describe("Choices", () => {
     expect(context.story.Continue()).toBe("one three");
     expect(context.story.currentTags).toEqual(["one", "three"]);
   });
+
+  //TestDynanicTagsInChoice
+  it("tests tags in choice", () => {
+    compileStory("dynamic_tags_in_choice", true);
+    context.story.Continue();
+
+    expect(context.story.currentTags.length).toBe(0);
+    expect(context.story.currentChoices.length).toBe(1);
+    expect(context.story.currentChoices[0].text).toEqual("choice");
+    expect(context.story.currentChoices[0].tags).toEqual(["tag aaabbb"]);
+  });
 });